diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index ba32d3fa754..4da1d06d8e0 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -103,7 +103,7 @@ class Session(openerpweb.Controller): @openerpweb.jsonrequest def modules(self, req): - return {"modules": ["base", "base_hello"]} + return {"modules": ["base", "base_hello", "base_calendar"]} @openerpweb.jsonrequest def csslist(self, req, mods='base,base_hello'): diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py index 863e0dd9394..44c80ae1a58 100644 --- a/addons/base_calendar/__openerp__.py +++ b/addons/base_calendar/__openerp__.py @@ -1,52 +1,7 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - { - "name" : "Basic Calendar Functionality", - "version" : "1.0", - "depends" : ["base"], - 'description': """Full featured calendar system that supports: - - Calendar of events - - Alerts (create requests) - - Recurring events - - Invitations to people""", - "author" : "OpenERP SA", - 'category': 'Tools', - 'website': 'http://www.openerp.com', - "init_xml" : [ - 'base_calendar_data.xml' - ], - "demo_xml" : [], - "update_xml" : [ - 'security/calendar_security.xml', - 'security/ir.model.access.csv', - 'wizard/calendar_event_edit_all_view.xml', - 'wizard/base_calendar_invite_attendee_view.xml', - 'wizard/base_calendar_set_exrule_view.xml', - 'base_calendar_view.xml' - ], - "test" : ['test/base_calendar_test.yml'], - "installable" : True, - "active" : False, - "certificate" : "00694071962960352821", + "name": "Hello", + "version": "2.0", + "depends": [], + "js": ["static/*/js/*.js"], + "css": [], } - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_calendar/static/openerp/js/base_calendar.js b/addons/base_calendar/static/openerp/js/base_calendar.js new file mode 100644 index 00000000000..37c1cd1a8f7 --- /dev/null +++ b/addons/base_calendar/static/openerp/js/base_calendar.js @@ -0,0 +1,28 @@ +/*--------------------------------------------------------- + * OpenERP base_calendar + *---------------------------------------------------------*/ + +openerp.base_calendar = function(openerp) { + +openerp.base_calendar.CalendarView = openerp.base.Controller.extend({ +// Dhtmlx scheduler ? +}); + +//openerp.base.Action = openerp.base.Action.extend({ +// do_action_window: function(action) { +// this._super.apply(this,arguments); +// for(var i = 0; i < action.views.length; i++) { +// if(action.views[i][1] == "calendar") { +// this.calendar_id = action.views[i][0]; +// break; +// } +// } +// // IF there is a view calender +// // if(this.calendar_id +// }, +//}); + +}; + +// DEBUG_RPC:rpc.request:('execute', 'addons-dsh-l10n_us', 1, '*', ('ir.filters', 'get_filters', u'res.partner')) +// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: