diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index 99fb1cd2440..ba24c055f70 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -307,10 +307,10 @@ class DataSet(openerpweb.Controller): return Model.read(ids, fields or False) @openerpweb.jsonrequest - def get(self, request, model, ids): - self.do_get(request, model, ids) + def get(self, request, model, ids, fields=False): + return self.do_get(request, model, ids, fields) - def do_get(self, request, model, ids): + def do_get(self, request, model, ids, fields=False): """ Fetches and returns the records of the model ``model`` whose ids are in ``ids``. @@ -327,7 +327,7 @@ class DataSet(openerpweb.Controller): :rtype: list """ Model = request.session.model(model) - records = Model.read(ids) + records = Model.read(ids, fields) record_map = dict((record['id'], record) for record in records) diff --git a/addons/base/static/lib/jquery.ui/js/jquery-ui-timepicker-addon.js b/addons/base/static/lib/jquery.ui/js/jquery-ui-timepicker-addon.js new file mode 100644 index 00000000000..85c795c2e79 --- /dev/null +++ b/addons/base/static/lib/jquery.ui/js/jquery-ui-timepicker-addon.js @@ -0,0 +1,911 @@ +/* +* jQuery timepicker addon +* By: Trent Richardson [http://trentrichardson.com] +* Version 0.9.3 +* Last Modified: 02/05/2011 +* +* Copyright 2010 Trent Richardson +* Dual licensed under the MIT and GPL licenses. +* http://trentrichardson.com/Impromptu/GPL-LICENSE.txt +* http://trentrichardson.com/Impromptu/MIT-LICENSE.txt +* +* HERES THE CSS: +* .ui-timepicker-div .ui-widget-header{ margin-bottom: 8px; } +* .ui-timepicker-div dl{ text-align: left; } +* .ui-timepicker-div dl dt{ height: 25px; } +* .ui-timepicker-div dl dd{ margin: -25px 0 10px 65px; } +* .ui-timepicker-div td { font-size: 90%; } +*/ + +(function($) { + +$.extend($.ui, { timepicker: { version: "0.9.3" } }); + +/* Time picker manager. + Use the singleton instance of this class, $.timepicker, to interact with the time picker. + Settings for (groups of) time pickers are maintained in an instance object, + allowing multiple different settings on the same page. */ + +function Timepicker() { + this.regional = []; // Available regional settings, indexed by language code + this.regional[''] = { // Default regional settings + currentText: 'Now', + closeText: 'Done', + ampm: false, + timeFormat: 'hh:mm tt', + timeOnlyTitle: 'Choose Time', + timeText: 'Time', + hourText: 'Hour', + minuteText: 'Minute', + secondText: 'Second' + }; + this._defaults = { // Global defaults for all the datetime picker instances + showButtonPanel: true, + timeOnly: false, + showHour: true, + showMinute: true, + showSecond: false, + showTime: true, + stepHour: 0.05, + stepMinute: 0.05, + stepSecond: 0.05, + hour: 0, + minute: 0, + second: 0, + hourMin: 0, + minuteMin: 0, + secondMin: 0, + hourMax: 23, + minuteMax: 59, + secondMax: 59, + minDateTime: null, + maxDateTime: null, + hourGrid: 0, + minuteGrid: 0, + secondGrid: 0, + alwaysSetTime: true, + separator: ' ', + altFieldTimeOnly: true, + showTimepicker: true + }; + $.extend(this._defaults, this.regional['']); +} + +$.extend(Timepicker.prototype, { + $input: null, + $altInput: null, + $timeObj: null, + inst: null, + hour_slider: null, + minute_slider: null, + second_slider: null, + hour: 0, + minute: 0, + second: 0, + hourMinOriginal: null, + minuteMinOriginal: null, + secondMinOriginal: null, + hourMaxOriginal: null, + minuteMaxOriginal: null, + secondMaxOriginal: null, + ampm: '', + formattedDate: '', + formattedTime: '', + formattedDateTime: '', + + /* Override the default settings for all instances of the time picker. + @param settings object - the new settings to use as defaults (anonymous object) + @return the manager object */ + setDefaults: function(settings) { + extendRemove(this._defaults, settings || {}); + return this; + }, + + //######################################################################## + // Create a new Timepicker instance + //######################################################################## + _newInst: function($input, o) { + var tp_inst = new Timepicker(), + inlineSettings = {}; + + tp_inst.hour = tp_inst._defaults.hour; + tp_inst.minute = tp_inst._defaults.minute; + tp_inst.second = tp_inst._defaults.second; + tp_inst.ampm = ''; + tp_inst.$input = $input; + + + for (var attrName in this._defaults) { + var attrValue = $input.attr('time:' + attrName); + if (attrValue) { + try { + inlineSettings[attrName] = eval(attrValue); + } catch (err) { + inlineSettings[attrName] = attrValue; + } + } + } + tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, o, { + beforeShow: function(input, dp_inst) { + if ($.isFunction(o.beforeShow)) + o.beforeShow(input, dp_inst, tp_inst); + }, + onChangeMonthYear: function(year, month, dp_inst) { + // Update the time as well : this prevents the time from disappearing from the $input field. + tp_inst._updateDateTime(dp_inst); + if ($.isFunction(o.onChangeMonthYear)) + o.onChangeMonthYear(year, month, dp_inst, tp_inst); + }, + onClose: function(dateText, dp_inst) { + if (tp_inst.timeDefined === true && $input.val() != '') + tp_inst._updateDateTime(dp_inst); + if ($.isFunction(o.onClose)) + o.onClose(dateText, dp_inst, tp_inst); + }, + timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker'); + }); + + if (o.altField) + tp_inst.$altInput = $(o.altField) + .css({ cursor: 'pointer' }) + .focus(function(){ $input.trigger("focus"); }); + + // datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime.. + if(tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date) + tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime()); + if(tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date) + tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime()); + if(tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date) + tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime()); + if(tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date) + tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime()); + + return tp_inst; + }, + + //######################################################################## + // add our sliders to the calendar + //######################################################################## + _addTimePicker: function(dp_inst) { + var currDT = (this.$altInput && this._defaults.altFieldTimeOnly) ? + this.$input.val() + ' ' + this.$altInput.val() : + this.$input.val(); + + this.timeDefined = this._parseTime(currDT); + this._limitMinMaxDateTime(dp_inst, false); + this._injectTimePicker(); + }, + + //######################################################################## + // parse the time string from input value or _setTime + //######################################################################## + _parseTime: function(timeString, withDate) { + var regstr = this._defaults.timeFormat.toString() + .replace(/h{1,2}/ig, '(\\d?\\d)') + .replace(/m{1,2}/ig, '(\\d?\\d)') + .replace(/s{1,2}/ig, '(\\d?\\d)') + .replace(/t{1,2}/ig, '(am|pm|a|p)?') + .replace(/\s/g, '\\s?') + '$', + order = this._getFormatPositions(), + treg; + + if (!this.inst) this.inst = $.datepicker._getInst(this.$input[0]); + + if (withDate || !this._defaults.timeOnly) { + // the time should come after x number of characters and a space. + // x = at least the length of text specified by the date format + var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat'); + regstr = '.{' + dp_dateFormat.length + ',}' + this._defaults.separator + regstr; + } + + treg = timeString.match(new RegExp(regstr, 'i')); + + if (treg) { + if (order.t !== -1) + this.ampm = ((treg[order.t] === undefined || treg[order.t].length === 0) ? + '' : + (treg[order.t].charAt(0).toUpperCase() == 'A') ? 'AM' : 'PM').toUpperCase(); + + if (order.h !== -1) { + if (this.ampm == 'AM' && treg[order.h] == '12') + this.hour = 0; // 12am = 0 hour + else if (this.ampm == 'PM' && treg[order.h] != '12') + this.hour = (parseFloat(treg[order.h]) + 12).toFixed(0); // 12pm = 12 hour, any other pm = hour + 12 + else this.hour = Number(treg[order.h]); + } + + if (order.m !== -1) this.minute = Number(treg[order.m]); + if (order.s !== -1) this.second = Number(treg[order.s]); + + return true; + + } + return false; + }, + + //######################################################################## + // figure out position of time elements.. cause js cant do named captures + //######################################################################## + _getFormatPositions: function() { + var finds = this._defaults.timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|t{1,2})/g), + orders = { h: -1, m: -1, s: -1, t: -1 }; + + if (finds) + for (var i = 0; i < finds.length; i++) + if (orders[finds[i].toString().charAt(0)] == -1) + orders[finds[i].toString().charAt(0)] = i + 1; + + return orders; + }, + + //######################################################################## + // generate and inject html for timepicker into ui datepicker + //######################################################################## + _injectTimePicker: function() { + var $dp = this.inst.dpDiv, + o = this._defaults, + tp_inst = this, + // Added by Peter Medeiros: + // - Figure out what the hour/minute/second max should be based on the step values. + // - Example: if stepMinute is 15, then minMax is 45. + hourMax = (o.hourMax - (o.hourMax % o.stepHour)).toFixed(0), + minMax = (o.minuteMax - (o.minuteMax % o.stepMinute)).toFixed(0), + secMax = (o.secondMax - (o.secondMax % o.stepSecond)).toFixed(0), + dp_id = this.inst.id.toString().replace(/([^A-Za-z0-9_])/g, ''); + + // Prevent displaying twice + //if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0) { + if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0 && o.showTimepicker) { + var noDisplay = ' style="display:none;"', + html = '
' + + '
' + o.timeText + '
' + + '
' + + '
' + o.hourText + '
', + hourGridSize = 0, + minuteGridSize = 0, + secondGridSize = 0, + size; + + if (o.showHour && o.hourGrid > 0) { + html += '
' + + '
' + + '
'; + + for (var h = o.hourMin; h < hourMax; h += o.hourGrid) { + hourGridSize++; + var tmph = (o.ampm && h > 12) ? h-12 : h; + if (tmph < 10) tmph = '0' + tmph; + if (o.ampm) { + if (h == 0) tmph = 12 +'a'; + else if (h < 12) tmph += 'a'; + else tmph += 'p'; + } + html += ''; + } + + html += '
' + tmph + '
' + + '
'; + } else html += '
'; + + html += '
' + o.minuteText + '
'; + + if (o.showMinute && o.minuteGrid > 0) { + html += '
' + + '
' + + '
'; + + for (var m = o.minuteMin; m < minMax; m += o.minuteGrid) { + minuteGridSize++; + html += ''; + } + + html += '
' + ((m < 10) ? '0' : '') + m + '
' + + '
'; + } else html += '
'; + + html += '
' + o.secondText + '
'; + + if (o.showSecond && o.secondGrid > 0) { + html += '
' + + '
' + + '
'; + + for (var s = o.secondMin; s < secMax; s += o.secondGrid) { + secondGridSize++; + html += ''; + } + + html += '
' + ((s < 10) ? '0' : '') + s + '
' + + '
'; + } else html += '
'; + + html += '
'; + $tp = $(html); + + // if we only want time picker... + if (o.timeOnly === true) { + $tp.prepend( + '
' + + '
' + o.timeOnlyTitle + '
' + + '
'); + $dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide(); + } + + this.hour_slider = $tp.find('#ui_tpicker_hour_'+ dp_id).slider({ + orientation: "horizontal", + value: this.hour, + min: o.hourMin, + max: hourMax, + step: o.stepHour, + slide: function(event, ui) { + tp_inst.hour_slider.slider( "option", "value", ui.value); + tp_inst._onTimeChange(); + } + }); + + // Updated by Peter Medeiros: + // - Pass in Event and UI instance into slide function + this.minute_slider = $tp.find('#ui_tpicker_minute_'+ dp_id).slider({ + orientation: "horizontal", + value: this.minute, + min: o.minuteMin, + max: minMax, + step: o.stepMinute, + slide: function(event, ui) { + // update the global minute slider instance value with the current slider value + tp_inst.minute_slider.slider( "option", "value", ui.value); + tp_inst._onTimeChange(); + } + }); + + this.second_slider = $tp.find('#ui_tpicker_second_'+ dp_id).slider({ + orientation: "horizontal", + value: this.second, + min: o.secondMin, + max: secMax, + step: o.stepSecond, + slide: function(event, ui) { + tp_inst.second_slider.slider( "option", "value", ui.value); + tp_inst._onTimeChange(); + } + }); + + // Add grid functionality + if (o.showHour && o.hourGrid > 0) { + size = 100 * hourGridSize * o.hourGrid / (hourMax - o.hourMin); + + $tp.find(".ui_tpicker_hour table").css({ + width: size + "%", + marginLeft: (size / (-2 * hourGridSize)) + "%", + borderCollapse: 'collapse' + }).find("td").each( function(index) { + $(this).click(function() { + var h = $(this).html(); + if(o.ampm) { + var ap = h.substring(2).toLowerCase(), + aph = parseInt(h.substring(0,2)); + if (ap == 'a') { + if (aph == 12) h = 0; + else h = aph; + } else if (aph == 12) h = 12; + else h = aph + 12; + } + tp_inst.hour_slider.slider("option", "value", h); + tp_inst._onTimeChange(); + }).css({ + cursor: 'pointer', + width: (100 / hourGridSize) + '%', + textAlign: 'center', + overflow: 'hidden' + }); + }); + } + + if (o.showMinute && o.minuteGrid > 0) { + size = 100 * minuteGridSize * o.minuteGrid / (minMax - o.minuteMin); + $tp.find(".ui_tpicker_minute table").css({ + width: size + "%", + marginLeft: (size / (-2 * minuteGridSize)) + "%", + borderCollapse: 'collapse' + }).find("td").each(function(index) { + $(this).click(function() { + tp_inst.minute_slider.slider("option", "value", $(this).html()); + tp_inst._onTimeChange(); + }).css({ + cursor: 'pointer', + width: (100 / minuteGridSize) + '%', + textAlign: 'center', + overflow: 'hidden' + }); + }); + } + + if (o.showSecond && o.secondGrid > 0) { + $tp.find(".ui_tpicker_second table").css({ + width: size + "%", + marginLeft: (size / (-2 * secondGridSize)) + "%", + borderCollapse: 'collapse' + }).find("td").each(function(index) { + $(this).click(function() { + tp_inst.second_slider.slider("option", "value", $(this).html()); + tp_inst._onTimeChange(); + }).css({ + cursor: 'pointer', + width: (100 / secondGridSize) + '%', + textAlign: 'center', + overflow: 'hidden' + }); + }); + } + + var $buttonPanel = $dp.find('.ui-datepicker-buttonpane'); + if ($buttonPanel.length) $buttonPanel.before($tp); + else $dp.append($tp); + + this.$timeObj = $('#ui_tpicker_time_'+ dp_id); + + if (this.inst !== null) { + var timeDefined = this.timeDefined; + this._onTimeChange(); + this.timeDefined = timeDefined; + } + + //Emulate datepicker onSelect behavior. Call on slidestop. + var onSelect = tp_inst._defaults['onSelect']; + if (onSelect) { + var inputEl = tp_inst.$input ? tp_inst.$input[0] : null; + var onSelectHandler = function() { + onSelect.apply(inputEl, [tp_inst.formattedDateTime, tp_inst]); // trigger custom callback*/ + } + this.hour_slider.bind('slidestop',onSelectHandler); + this.minute_slider.bind('slidestop',onSelectHandler); + this.second_slider.bind('slidestop',onSelectHandler); + } + } + }, + + //######################################################################## + // This function tries to limit the ability to go outside the + // min/max date range + //######################################################################## + _limitMinMaxDateTime: function(dp_inst, adjustSliders){ + var o = this._defaults, + dp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay), + tp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay, this.hour, this.minute, this.second, 0); + + if(this._defaults.minDateTime !== null && dp_date){ + var minDateTime = this._defaults.minDateTime, + minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0); + + if(this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null){ + this.hourMinOriginal = o.hourMin; + this.minuteMinOriginal = o.minuteMin; + this.secondMinOriginal = o.secondMin; + } + + if(minDateTimeDate.getTime() == dp_date.getTime()){ + this._defaults.hourMin = minDateTime.getHours(); + this._defaults.minuteMin = minDateTime.getMinutes(); + this._defaults.secondMin = minDateTime.getSeconds(); + + if(this.hour < this._defaults.hourMin) this.hour = this._defaults.hourMin; + if(this.minute < this._defaults.minuteMin) this.minute = this._defaults.minuteMin; + if(this.second < this._defaults.secondMin) this.second = this._defaults.secondMin; + }else{ + this._defaults.hourMin = this.hourMinOriginal; + this._defaults.minuteMin = this.minuteMinOriginal; + this._defaults.secondMin = this.secondMinOriginal; + } + } + + if(this._defaults.maxDateTime !== null && dp_date){ + var maxDateTime = this._defaults.maxDateTime, + maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0); + + if(this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null){ + this.hourMaxOriginal = o.hourMax; + this.minuteMaxOriginal = o.minuteMax; + this.secondMaxOriginal = o.secondMax; + } + + if(maxDateTimeDate.getTime() == dp_date.getTime()){ + this._defaults.hourMax = maxDateTime.getHours(); + this._defaults.minuteMax = maxDateTime.getMinutes(); + this._defaults.secondMax = maxDateTime.getSeconds(); + + if(this.hour > this._defaults.hourMax){ this.hour = this._defaults.hourMax; } + if(this.minute > this._defaults.minuteMax) this.minute = this._defaults.minuteMax; + if(this.second > this._defaults.secondMax) this.second = this._defaults.secondMax; + }else{ + this._defaults.hourMax = this.hourMaxOriginal; + this._defaults.minuteMax = this.minuteMaxOriginal; + this._defaults.secondMax = this.secondMaxOriginal; + } + } + + if(adjustSliders !== undefined && adjustSliders === true){ + this.hour_slider.slider("option", { min: this._defaults.hourMin, max: this._defaults.hourMax }).slider('value', this.hour); + this.minute_slider.slider("option", { min: this._defaults.minuteMin, max: this._defaults.minuteMax }).slider('value', this.minute); + this.second_slider.slider("option", { min: this._defaults.secondMin, max: this._defaults.secondMax }).slider('value', this.second); + } + + }, + + //######################################################################## + // when a slider moves, set the internal time... + // on time change is also called when the time is updated in the text field + //######################################################################## + _onTimeChange: function() { + var hour = (this.hour_slider) ? this.hour_slider.slider('value') : false, + minute = (this.minute_slider) ? this.minute_slider.slider('value') : false, + second = (this.second_slider) ? this.second_slider.slider('value') : false; + + if (hour !== false) hour = parseInt(hour,10); + if (minute !== false) minute = parseInt(minute,10); + if (second !== false) second = parseInt(second,10); + + var ampm = (hour < 12) ? 'AM' : 'PM'; + + // If the update was done in the input field, the input field should not be updated. + // If the update was done using the sliders, update the input field. + var hasChanged = (hour != this.hour || minute != this.minute || second != this.second || (this.ampm.length > 0 && this.ampm != ampm)); + + if (hasChanged) { + + if (hour !== false)this.hour = hour; + if (minute !== false) this.minute = minute; + if (second !== false) this.second = second; + } + if (this._defaults.ampm) this.ampm = ampm; + + this._formatTime(); + if (this.$timeObj) this.$timeObj.text(this.formattedTime); + this.timeDefined = true; + if (hasChanged) this._updateDateTime(); + }, + + //######################################################################## + // format the time all pretty... + //######################################################################## + _formatTime: function(time, format, ampm) { + if (ampm == undefined) ampm = this._defaults.ampm; + time = time || { hour: this.hour, minute: this.minute, second: this.second, ampm: this.ampm }; + var tmptime = format || this._defaults.timeFormat.toString(); + + if (ampm) { + var hour12 = ((time.ampm == 'AM') ? (time.hour) : (time.hour % 12)); + hour12 = (Number(hour12) === 0) ? 12 : hour12; + tmptime = tmptime.toString() + .replace(/hh/g, ((hour12 < 10) ? '0' : '') + hour12) + .replace(/h/g, hour12) + .replace(/mm/g, ((time.minute < 10) ? '0' : '') + time.minute) + .replace(/m/g, time.minute) + .replace(/ss/g, ((time.second < 10) ? '0' : '') + time.second) + .replace(/s/g, time.second) + .replace(/TT/g, time.ampm.toUpperCase()) + .replace(/tt/g, time.ampm.toLowerCase()) + .replace(/T/g, time.ampm.charAt(0).toUpperCase()) + .replace(/t/g, time.ampm.charAt(0).toLowerCase()); + } else { + tmptime = tmptime.toString() + .replace(/hh/g, ((time.hour < 10) ? '0' : '') + time.hour) + .replace(/h/g, time.hour) + .replace(/mm/g, ((time.minute < 10) ? '0' : '') + time.minute) + .replace(/m/g, time.minute) + .replace(/ss/g, ((time.second < 10) ? '0' : '') + time.second) + .replace(/s/g, time.second); + tmptime = $.trim(tmptime.replace(/t/gi, '')); + } + + if (arguments.length) return tmptime; + else this.formattedTime = tmptime; + }, + + //######################################################################## + // update our input with the new date time.. + //######################################################################## + _updateDateTime: function(dp_inst) { + dp_inst = this.inst || dp_inst, + dt = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay), + dateFmt = $.datepicker._get(dp_inst, 'dateFormat'), + formatCfg = $.datepicker._getFormatConfig(dp_inst), + timeAvailable = dt !== null && this.timeDefined; + this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg); + var formattedDateTime = this.formattedDate; + if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0)) + return; + + if (this._defaults.timeOnly === true) { + formattedDateTime = this.formattedTime; + } else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) { + formattedDateTime += this._defaults.separator + this.formattedTime; + } + + this.formattedDateTime = formattedDateTime; + + if(!this._defaults.showTimepicker) { + this.$input.val(this.formattedDate); + } else if (this.$altInput && this._defaults.altFieldTimeOnly === true) { + this.$altInput.val(this.formattedTime); + this.$input.val(this.formattedDate); + } else if(this.$altInput) { + this.$altInput.val(formattedDateTime); + this.$input.val(formattedDateTime); + } else { + this.$input.val(formattedDateTime); + } + + this.$input.trigger("change"); + } + +}); + +$.fn.extend({ + //######################################################################## + // shorthand just to use timepicker.. + //######################################################################## + timepicker: function(o) { + o = o || {}; + var tmp_args = arguments; + + if (typeof o == 'object') tmp_args[0] = $.extend(o, { timeOnly: true }); + + return $(this).each(function() { + $.fn.datetimepicker.apply($(this), tmp_args); + }); + }, + + //######################################################################## + // extend timepicker to datepicker + //######################################################################## + datetimepicker: function(o) { + o = o || {}; + var $input = this, + tmp_args = arguments; + + if (typeof(o) == 'string'){ + if(o == 'getDate') + return $.fn.datepicker.apply($(this[0]), tmp_args); + else + return this.each(function() { + var $t = $(this); + $t.datepicker.apply($t, tmp_args); + }); + } + else + return this.each(function() { + var $t = $(this); + $t.datepicker($.timepicker._newInst($t, o)._defaults); + }); + } +}); + +//######################################################################## +// the bad hack :/ override datepicker so it doesnt close on select +// inspired: http://stackoverflow.com/questions/1252512/jquery-datepicker-prevent-closing-picker-when-clicking-a-date/1762378#1762378 +//######################################################################## +$.datepicker._base_selectDate = $.datepicker._selectDate; +$.datepicker._selectDate = function (id, dateStr) { + var inst = this._getInst($(id)[0]), + tp_inst = this._get(inst, 'timepicker'); + + if (tp_inst) { + tp_inst._limitMinMaxDateTime(inst, true); + inst.inline = inst.stay_open = true; + //This way the onSelect handler called from calendarpicker get the full dateTime + this._base_selectDate(id, dateStr + tp_inst._defaults.separator + tp_inst.formattedTime); + inst.inline = inst.stay_open = false; + this._notifyChange(inst); + this._updateDatepicker(inst); + } + else this._base_selectDate(id, dateStr); +}; + +//############################################################################################# +// second bad hack :/ override datepicker so it triggers an event when changing the input field +// and does not redraw the datepicker on every selectDate event +//############################################################################################# +$.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker; +$.datepicker._updateDatepicker = function(inst) { + if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) { + + this._base_updateDatepicker(inst); + + // Reload the time control when changing something in the input text field. + var tp_inst = this._get(inst, 'timepicker'); + if(tp_inst) tp_inst._addTimePicker(inst); + } +}; + +//####################################################################################### +// third bad hack :/ override datepicker so it allows spaces and colan in the input field +//####################################################################################### +$.datepicker._base_doKeyPress = $.datepicker._doKeyPress; +$.datepicker._doKeyPress = function(event) { + var inst = $.datepicker._getInst(event.target), + tp_inst = $.datepicker._get(inst, 'timepicker'); + + if (tp_inst) { + if ($.datepicker._get(inst, 'constrainInput')) { + var ampm = tp_inst._defaults.ampm, + datetimeChars = tp_inst._defaults.timeFormat.toString() + .replace(/[hms]/g, '') + .replace(/TT/g, ampm ? 'APM' : '') + .replace(/T/g, ampm ? 'AP' : '') + .replace(/tt/g, ampm ? 'apm' : '') + .replace(/t/g, ampm ? 'ap' : '') + + " " + + tp_inst._defaults.separator + + $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')), + chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode); + return event.ctrlKey || (chr < ' ' || !datetimeChars || datetimeChars.indexOf(chr) > -1); + } + } + + return $.datepicker._base_doKeyPress(event); +}; + +//####################################################################################### +// Override key up event to sync manual input changes. +//####################################################################################### +$.datepicker._base_doKeyUp = $.datepicker._doKeyUp; +$.datepicker._doKeyUp = function (event) { + var inst = $.datepicker._getInst(event.target), + tp_inst = $.datepicker._get(inst, 'timepicker'); + + if (tp_inst) { + if (tp_inst._defaults.timeOnly && (inst.input.val() != inst.lastVal)) { + try { + $.datepicker._updateDatepicker(inst); + } + catch (err) { + $.datepicker.log(err); + } + } + } + + return $.datepicker._base_doKeyUp(event); +}; + +//####################################################################################### +// override "Today" button to also grab the time. +//####################################################################################### +$.datepicker._base_gotoToday = $.datepicker._gotoToday; +$.datepicker._gotoToday = function(id) { + this._base_gotoToday(id); + this._setTime(this._getInst($(id)[0]), new Date()); +}; + +//####################################################################################### +// Disable & enable the Time in the datetimepicker +//####################################################################################### +$.datepicker._disableTimepickerDatepicker = function(target, date, withDate) { + var inst = this._getInst(target), + tp_inst = this._get(inst, 'timepicker'); + if (tp_inst) { + tp_inst._defaults.showTimepicker = false; + tp_inst._onTimeChange(); + tp_inst._updateDateTime(inst); + } +}; + +$.datepicker._enableTimepickerDatepicker = function(target, date, withDate) { + var inst = this._getInst(target), + tp_inst = this._get(inst, 'timepicker'); + if (tp_inst) { + tp_inst._defaults.showTimepicker = true; + tp_inst._onTimeChange(); + tp_inst._updateDateTime(inst); + } +}; + +//####################################################################################### +// Create our own set time function +//####################################################################################### +$.datepicker._setTime = function(inst, date) { + var tp_inst = this._get(inst, 'timepicker'); + if (tp_inst) { + var defaults = tp_inst._defaults, + // calling _setTime with no date sets time to defaults + hour = date ? date.getHours() : defaults.hour, + minute = date ? date.getMinutes() : defaults.minute, + second = date ? date.getSeconds() : defaults.second; + + //check if within min/max times.. + if ((hour < defaults.hourMin || hour > defaults.hourMax) || (minute < defaults.minuteMin || minute > defaults.minuteMax) || (second < defaults.secondMin || second > defaults.secondMax)) { + hour = defaults.hourMin; + minute = defaults.minuteMin; + second = defaults.secondMin; + } + + if (tp_inst.hour_slider) tp_inst.hour_slider.slider('value', hour); + else tp_inst.hour = hour; + if (tp_inst.minute_slider) tp_inst.minute_slider.slider('value', minute); + else tp_inst.minute = minute; + if (tp_inst.second_slider) tp_inst.second_slider.slider('value', second); + else tp_inst.second = second; + + tp_inst._onTimeChange(); + tp_inst._updateDateTime(inst); + } +}; + +//####################################################################################### +// Create new public method to set only time, callable as $().datepicker('setTime', date) +//####################################################################################### +$.datepicker._setTimeDatepicker = function(target, date, withDate) { + var inst = this._getInst(target), + tp_inst = this._get(inst, 'timepicker'); + + if (tp_inst) { + this._setDateFromField(inst); + var tp_date; + if (date) { + if (typeof date == "string") { + tp_inst._parseTime(date, withDate); + tp_date = new Date(); + tp_date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second); + } + else tp_date = new Date(date.getTime()); + if (tp_date.toString() == 'Invalid Date') tp_date = undefined; + } + this._setTime(inst, tp_date); + } + +}; + +//####################################################################################### +// override setDate() to allow setting time too within Date object +//####################################################################################### +$.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker; +$.datepicker._setDateDatepicker = function(target, date) { + var inst = this._getInst(target), + tp_date = (date instanceof Date) ? new Date(date.getTime()) : date; + + this._updateDatepicker(inst); + this._base_setDateDatepicker.apply(this, arguments); + this._setTimeDatepicker(target, tp_date, true); +}; + +//####################################################################################### +// override getDate() to allow getting time too within Date object +//####################################################################################### +$.datepicker._base_getDateDatepicker = $.datepicker._getDateDatepicker; +$.datepicker._getDateDatepicker = function(target, noDefault) { + var inst = this._getInst(target), + tp_inst = this._get(inst, 'timepicker'); + + if (tp_inst) { + this._setDateFromField(inst, noDefault); + var date = this._getDate(inst); + if (date && tp_inst._parseTime($(target).val(), true)) date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second); + return date; + } + return this._base_getDateDatepicker(target, noDefault); +}; + +//####################################################################################### +// jQuery extend now ignores nulls! +//####################################################################################### +function extendRemove(target, props) { + $.extend(target, props); + for (var name in props) + if (props[name] === null || props[name] === undefined) + target[name] = props[name]; + return target; +} + +$.timepicker = new Timepicker(); // singleton instance +$.timepicker.version = "0.9.3"; + +})(jQuery); diff --git a/addons/base/static/lib/jquery/jquery-1.5.1.js b/addons/base/static/lib/jquery/jquery-1.5.1.js index 78fcfa469b3..ade6b94651c 100644 --- a/addons/base/static/lib/jquery/jquery-1.5.1.js +++ b/addons/base/static/lib/jquery/jquery-1.5.1.js @@ -865,9 +865,9 @@ jQuery.extend({ // We have to add a catch block for // IE prior to 8 or else the finally // block will never get executed - catch (e) { - throw e; - } + // catch (e) { + // throw e; + // } finally { fired = [ context, args ]; firing = 0; diff --git a/addons/base/static/src/base.html b/addons/base/static/src/base.html index 7f45085a76d..103e19e25ed 100644 --- a/addons/base/static/src/base.html +++ b/addons/base/static/src/base.html @@ -10,6 +10,7 @@ + diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css index 151ec6e214e..82ff0339226 100644 --- a/addons/base/static/src/css/base.css +++ b/addons/base/static/src/css/base.css @@ -12,7 +12,7 @@ body { margin: 2px; } -.#oe_header h2 { +#oe_header h2 { margin: 2px 0; } @@ -68,16 +68,6 @@ body.openerp { width: 100%; height: 100%; } -/* Main Application */ -.openerp .application { - padding: 6px; -} - -.openerp h3.title { - margin: 2px 0; - color: #252424; - text-shadow: white 0 1px 0; -} /* Menu */ .openerp .sf-menu { @@ -305,8 +295,23 @@ body.openerp { text-align: center; } -/* SearchView */ +/* Main Application */ +.openerp .application { + padding: 6px; +} +.openerp h2.oe_view_title { + margin: 2px 0; + color: #252424; + text-shadow: white 0 1px 0; +} + +/* View Manager */ +.openerp .oe_vm_switch { + float: right; +} + +/* SearchView */ .openerp .filter_label, .openerp .filter_icon { border: 1px solid #666; border-left-width: 0; @@ -395,15 +400,14 @@ body.openerp { padding-left: 10px; } -/* View Manager */ -.openerp .views-switchers { - text-align: right; -} /* Form */ .openerp .required.error { border: 1px solid #900; } +.openerp .oe_form_pager { + text-align: right; +} /* Inputs */ .openerp input[type="text"], .openerp input[type="password"], .openerp select, .openerp textarea { @@ -418,7 +422,7 @@ body.openerp { border-radius: 3px; background: white; } -.openerp input.field_date { +.openerp input.field_date, .openerp input.field_datetime { background: url('../img/ui/field_calendar.png') no-repeat right center; background-origin: content-box; -moz-background-origin: content; diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index 523f2c8a2b7..bd36b534c85 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -58,11 +58,9 @@ openerp.base.callback = function(obj, method) { * * @class */ -openerp.base.NotFound = Class.extend( - /** @lends openerp.base.NotFound# */ { +openerp.base.NotFound = Class.extend( /** @lends openerp.base.NotFound# */ { }); -openerp.base.KeyNotFound = openerp.base.NotFound.extend( - /** @lends openerp.base.KeyNotFound# */ { +openerp.base.KeyNotFound = openerp.base.NotFound.extend( /** @lends openerp.base.KeyNotFound# */ { /** * Thrown when a key could not be found in a mapping * @@ -77,8 +75,7 @@ openerp.base.KeyNotFound = openerp.base.NotFound.extend( return "The key " + this.key + " was not found"; } }); -openerp.base.ObjectNotFound = openerp.base.NotFound.extend( - /** @lends openerp.base.ObjectNotFound# */ { +openerp.base.ObjectNotFound = openerp.base.NotFound.extend( /** @lends openerp.base.ObjectNotFound# */ { /** * Thrown when an object path does not designate a valid class or object * in the openerp hierarchy. @@ -94,8 +91,7 @@ openerp.base.ObjectNotFound = openerp.base.NotFound.extend( return "Could not find any object of path " + this.path; } }); -openerp.base.Registry = Class.extend( - /** @lends openerp.base.Registry# */ { +openerp.base.Registry = Class.extend( /** @lends openerp.base.Registry# */ { /** * Stores a mapping of arbitrary key (strings) to object paths (as strings * as well). @@ -156,8 +152,7 @@ openerp.base.Registry = Class.extend( } }); -openerp.base.BasicController = Class.extend( - /** @lends openerp.base.BasicController# */{ +openerp.base.BasicController = Class.extend( /** @lends openerp.base.BasicController# */{ /** * rpc operations, event binding and callback calling should be done in * start() instead of init so that event can be hooked in between. @@ -198,6 +193,8 @@ openerp.base.BasicController = Class.extend( // try to call deferred methods on this return value. return $.Deferred().done().promise(); }, + on_ready: function() { + }, stop: function() { }, log: function() { @@ -209,25 +206,25 @@ openerp.base.BasicController = Class.extend( this.on_log.apply(this,args); }, on_log: function() { - if(window.console && (window.openerp.debug || (window.location.search.indexOf('?debug') !== -1))) - console.log(arguments); + if(true || window.openerp.debug || (window.location.search.indexOf('?debug') !== -1)) { + if(window.console) { + console.log(arguments); + } else { + $.each(arguments, function(i,v) { + v = v==null ? "null" : v; + $('
').text(v.toString()).appendTo($('body'));
+                });
+            }
+        }
+
     },
-    on_ready: function() {
-    }
 });
 
-openerp.base.Console =  openerp.base.BasicController.extend({
-    init: function(element_id, server, port) {
-        this._super(element_id);
-    }
-});
-
-openerp.base.Session = openerp.base.BasicController.extend(
-    /** @lends openerp.base.Session# */{
+openerp.base.Session = openerp.base.BasicController.extend( /** @lends openerp.base.Session# */{
     /**
      * @constructs
      * @extends openerp.base.BasicController
-     * @param element_id
+     * @param element_id to use for exception reporting
      * @param server
      * @param port
      */
@@ -249,18 +246,6 @@ openerp.base.Session = openerp.base.BasicController.extend(
     start: function() {
         this.session_restore();
     },
-    on_log: function() {
-        // TODO this should move to Console and be active only in debug
-        // TODO $element should be for error not log
-        var self = this;
-        this._super.apply(this,arguments);
-        $.each(arguments, function(i,v) {
-            if(self.$element) {
-                v = v==null ? "null" : v;
-                $('
').text(v.toString()).appendTo(self.$element);
-            }
-        });
-    },
     /**
      * Executes an RPC call, registering the provided callbacks.
      *
@@ -336,7 +321,6 @@ openerp.base.Session = openerp.base.BasicController.extend(
     on_rpc_response: function() {
     },
     on_rpc_error: function(error) {
-        // TODO this should use the $element with focus and button is displaying OPW etc...
         this.on_log(error.message, error.data.debug);
     },
     /**
@@ -386,7 +370,6 @@ openerp.base.Session = openerp.base.BasicController.extend(
         this.set_cookie('uid', this.uid);
         this.set_cookie('session_id', this.session_id);
     },
-    // TODO: clear_local
     /**
      * Fetches a cookie stored by an openerp session
      *
@@ -446,7 +429,6 @@ openerp.base.Session = openerp.base.BasicController.extend(
         var self = this;
         for(var j=0; j= this._active_ids.length) {
-            this._active_id_index = 0;
+        this.index += 1;
+        if (this.index >= this.ids.length) {
+            this.index = 0;
         }
         return this;
-    },
-
-    /**
-     * Sets active_ids by value:
-     *
-     * * Activates all ids part of the current selection
-     *
-     * * Sets active_id to be the first id of the selection
-     *
-     * @param {Array} ids the list of ids to activate
-     * @returns itself
-     */
-    select: function (ids) {
-        this._active_ids = ids;
-        this._active_id_index = 0;
-        return this;
-    },
-
-    /**
-     * Fetches the ids of the currently selected records, if any.
-     */
-    get_active_ids: function () {
-        return this._active_ids;
-    },
-
-    /**
-     * Sets the current active_id by value
-     *
-     * If there are no active_ids selected, selects the provided id as the sole active_id
-     *
-     * If there are ids selected and the provided id is not in them, raise an error
-     *
-     * @param {Object} id the id to activate
-     * @returns itself
-     */
-    activate: function (id) {
-        if(!this._active_ids) {
-            this._active_ids = [id];
-            this._active_id_index = 0;
-        } else {
-            var index = _.indexOf(this._active_ids, id);
-            if (index == -1) {
-                throw new Error(
-                    "Could not find id " + id +
-                    " in array [" + this._active_ids.join(', ') + "]");
-            }
-            this._active_id_index = index;
-        }
-        return this;
-    },
-
-    /**
-     * Fetches the id of the current active record, if any.
-     *
-     * @returns record? record id or null
-     */
-    get_active_id: function () {
-        if (!this._active_ids) {
-            return null;
-        }
-        return this._active_ids[this._active_id_index];
     }
+
 });
 
 openerp.base.DataRecord =  openerp.base.Controller.extend({
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index ea986729d94..245f38279e2 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -2,8 +2,7 @@
 openerp.base.form = function (openerp) {
 
 openerp.base.views.add('form', 'openerp.base.FormView');
-openerp.base.FormView =  openerp.base.Controller.extend(
-    /** @lends openerp.base.FormView# */{
+openerp.base.FormView =  openerp.base.Controller.extend( /** @lends openerp.base.FormView# */{
     /**
      * Indicates that this view is not searchable, and thus that no search
      * view should be displayed (if there is one active).
@@ -22,7 +21,7 @@ openerp.base.FormView =  openerp.base.Controller.extend(
         this.dataset = dataset;
         this.model = dataset.model;
         this.view_id = view_id;
-        this.fields_views = {};
+        this.fields_view = {};
         this.widgets = {};
         this.widgets_counter = 0;
         this.fields = {};
@@ -36,7 +35,6 @@ openerp.base.FormView =  openerp.base.Controller.extend(
     on_loaded: function(data) {
         var self = this;
         this.fields_view = data.fields_view;
-        //this.log(this.fields_view);
 
         var frame = new openerp.base.form.WidgetFrame(this, this.fields_view.arch);
 
@@ -44,31 +42,25 @@ openerp.base.FormView =  openerp.base.Controller.extend(
         _.each(this.widgets, function(w) {
             w.start();
         });
-        this.$element.find('button.form_save').click(this.do_save);
-
-//        this.dataset.on_active_id.add(this.on_record_loaded);
-//        this.dataset.active_id(fields of the form, this.on_record_loaded);
-
+        this.$element.find('div.oe_form_pager button[data-pager-action]').click(function() {
+            var action = $(this).data('pager-action');
+            self.on_pager_action(action);
+        });
+        
         // sidebar stuff
         if (this.view_manager.sidebar)
             this.view_manager.sidebar.load_multi_actions();
     },
-    on_next: function() {
-//        this.dataset.next();
-//        this.dataset.active_id(fields of the form, this.on_record_loaded);
-    },
-    on_prev: function() {
-
-//        this.dataset.prev();
-//        this.dataset.active_id(fields of the form, this.on_record_loaded);
-    },
     on_record_loaded: function(record) {
-        this.datarecord = record;
-        for (var f in this.fields) {
-            this.fields[f].set_value(this.datarecord.values[f]);
+        if (record.length) {
+            this.datarecord = record[0];
+            for (var f in this.fields) {
+                this.fields[f].set_value(this.datarecord.values[f]);
+            }
+            this.on_form_changed();
+            this.ready = true;
         }
-        this.on_form_changed();
-        this.ready = true;
+        this.do_update_pager();
     },
     on_form_changed: function(widget) {
         for (var w in this.widgets) {
@@ -106,11 +98,44 @@ openerp.base.FormView =  openerp.base.Controller.extend(
             // rpc - save.callbacl on_saved
         }
     },
+    do_show: function () {
+        this.dataset.fetch_index(this.fields_view.fields, this.on_record_loaded);
+        this.$element.show();
+    },
+    do_hide: function () {
+        this.$element.hide();
+    },
+    do_update_pager: function() {
+        var $pager = this.$element.find('div.oe_form_pager');
+        $pager.find("button[data-pager-action='first'], button[data-pager-action='previous']").attr('disabled', this.dataset.index == 0);
+        $pager.find("button[data-pager-action='next'], button[data-pager-action='last']").attr('disabled', this.dataset.index == this.dataset.ids.length - 1);
+        this.$element.find('span.oe_pager_index').html(this.dataset.index + 1);
+        this.$element.find('span.oe_pager_count').html(this.dataset.count);
+    },
+    on_pager_action: function(action) {
+        switch (action) {
+            case 'first':
+                this.dataset.index = 0;
+                break;
+            case 'previous':
+                this.dataset.previous();
+                break;
+            case 'next':
+                this.dataset.next();
+                break;
+            case 'last':
+                this.dataset.index = this.dataset.ids.length - 1;
+                break;
+        }
+        this.dataset.fetch_index(this.fields_view.fields, this.on_record_loaded);
+    },
     on_invalid: function() {
     },
     on_saved: function() {
         // Check response for exceptions, display error
     },
+    do_search: function (domains, contexts, groupbys) {
+    },
     on_action: function (action) {
     }
 });
@@ -119,8 +144,6 @@ openerp.base.FormView =  openerp.base.Controller.extend(
 openerp.base.form = {};
 
 openerp.base.form.Widget = openerp.base.Controller.extend({
-    // TODO Change this to init: function(view, node) { and use view.session and a new element_id for the super
-    // it means that widgets are special controllers
     init: function(view, node) {
         this.view = view;
         this.node = node;
@@ -261,22 +284,13 @@ openerp.base.form.WidgetFrame = openerp.base.form.Widget.extend({
     handle_node: function(n) {
         var type = this.view.fields_view.fields[n.attrs.name] || {};
         var widget_type = n.attrs.widget || type.type || n.tag;
-        try {
-            var widget = new (openerp.base.form.widgets.get_object(widget_type))
-                              (this.view, n);
-            if (n.tag == 'field' && n.attrs.nolabel != '1') {
-                var label = new (openerp.base.form.widgets.get_object('label'))
-                              (this.view, n);
-                label["for"] = widget;
-                this.add_widget(label);
-            }
-            this.add_widget(widget);
-        } catch (e) {
-            if (!e instanceof openerp.base.KeyNotFound) {
-                throw e;
-            }
-            this.log("Unhandled widget type : " + widget_type, n);
+        var widget = new (openerp.base.form.widgets.get_object(widget_type)) (this.view, n);
+        if (n.tag == 'field' && n.attrs.nolabel != '1') {
+            var label = new (openerp.base.form.widgets.get_object('label')) (this.view, n);
+            label["for"] = widget;
+            this.add_widget(label);
         }
+        this.add_widget(widget);
     },
     add_widget: function(w) {
         if (!w.invisible) {
@@ -392,9 +406,8 @@ openerp.base.form.FieldChar = openerp.base.form.Field.extend({
     },
     set_value: function(value) {
         this._super.apply(this, arguments);
-        if (value != null && value !== false) {
-            this.$element.find('input').val(value);
-        }
+        var show_value = (value != null && value !== false) ? value : '';
+        this.$element.find('input').val(show_value);
     },
     get_value: function() {
     },
@@ -429,9 +442,8 @@ openerp.base.form.FieldFloat = openerp.base.form.Field.extend({
     },
     set_value: function(value) {
         this._super.apply(this, arguments);
-        if (value != null && value !== false) {
-            this.$element.find('input').val(value.toFixed(2));
-        }
+        var show_value = (value != null && value !== false) ? value.toFixed(2) : '';
+        this.$element.find('input').val(value);
     },
     get_value: function() {
     },
@@ -456,9 +468,8 @@ openerp.base.form.FieldText = openerp.base.form.Field.extend({
     },
     set_value: function(value) {
         this._super.apply(this, arguments);
-        if (value != null && value !== false) {
-            this.$element.find('textarea').val(value);
-        }
+        var show_value = (value != null && value !== false) ? value : '';
+        this.$element.find('textarea').val(show_value);
     },
     get_value: function() {
         return this.$element.find('textarea').val();
@@ -486,7 +497,16 @@ openerp.base.form.FieldDate = openerp.base.form.FieldChar.extend({
     },
     start: function() {
         this._super.apply(this, arguments);
-        this.$element.find('input').datepicker();
+        this.$element.find('input').datepicker({
+            dateFormat: 'yy-mm-dd'
+        });
+    },
+    set_value: function(value) {
+        this._super.apply(this, arguments);
+        var show_value = (value != null && value !== false) ? value : '';
+        this.$element.find('input').val(show_value);
+    },
+    get_value: function() {
     }
 });
 
@@ -494,6 +514,20 @@ openerp.base.form.FieldDatetime = openerp.base.form.FieldChar.extend({
     init: function(view, node) {
         this._super(view, node);
         this.template = "FieldDatetime";
+    },
+    start: function() {
+        this._super.apply(this, arguments);
+        this.$element.find('input').datetimepicker({
+            dateFormat: 'yy-mm-dd',
+            timeFormat: 'hh:mm:ss'
+        });
+    },
+    set_value: function(value) {
+        this._super.apply(this, arguments);
+        var show_value = (value != null && value !== false) ? value : '';
+        this.$element.find('input').val(show_value);
+    },
+    get_value: function() {
     }
 });
 
@@ -510,6 +544,8 @@ openerp.base.form.FieldSelection = openerp.base.form.Field.extend({
         this._super.apply(this, arguments);
         if (value != null && value !== false) {
             this.$element.find('select').val(value);
+        } else {
+            this.$element.find('select')[0].selectedIndex = 0;
         }
     },
     get_value: function() {
@@ -521,6 +557,11 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
     init: function(view, node) {
         this._super(view, node);
         this.template = "FieldMany2One";
+    },
+    set_value: function(value) {
+        this._super.apply(this, arguments);
+        var show_value = (value != null && value !== false) ? value[1] : '';
+        this.$element.find('input').val(show_value);
     }
 });
 
@@ -528,6 +569,35 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({
     init: function(view, node) {
         this._super(view, node);
         this.template = "FieldOne2Many";
+        this.viewmanager = null;
+        this.operations = [];
+
+    },
+    start: function() {
+        this._super.apply(this, arguments);
+        this.log("o2m.start");
+        this.viewmanager = new openerp.base.ViewManager(this.view.session, this.element_id);
+        var action = {
+            res_model: this.field.relation,
+            views: [ [false,"list"], ],
+        };
+        this.viewmanager.do_action_window(action);
+
+    },
+    set_value: function(value) {
+        this.value = value;
+        this.log("o2m.set_value",value);
+    },
+    get_value: function(value) {
+        return this.operations;
+    },
+    update_dom: function() {
+        this._super.apply(this, arguments);
+        this.$element.toggleClass('disabled', this.readonly);
+        this.$element.toggleClass('required', this.required);
+    },
+    on_ui_change: function() {
+        this.view.on_form_changed(this);
     }
 });
 
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 7c4deb4e6ec..a4f06cf0d70 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -46,8 +46,7 @@ openerp.base.ListView = openerp.base.Controller.extend({
             }
         }
         this.dataset.fields = this.cols;
-        this.dataset.on_fetch.add(this.do_fill_table);
-        
+
         var width = this.$element.width();
         this.$table.jqGrid({
             datatype: "local",
@@ -82,6 +81,13 @@ openerp.base.ListView = openerp.base.Controller.extend({
             }));
 
     },
+    do_show: function () {
+        // TODO: re-trigger search
+        this.$element.show();
+    },
+    do_hide: function () {
+        this.$element.hide();
+    },
     do_search: function (domains, contexts, groupbys) {
         var self = this;
         this.rpc('/base/session/eval_domain_and_context', {
@@ -90,10 +96,9 @@ openerp.base.ListView = openerp.base.Controller.extend({
             group_by_seq: groupbys
         }, function (results) {
             // TODO: handle non-empty results.group_by with read_group
-            self.dataset.set({
-                context: results.context,
-                domain: results.domain
-            }).fetch(self.fields_view.fields, 0, self.limit);
+            self.dataset.context = results.context;
+            self.dataset.domain = results.domain;
+            self.dataset.fetch(self.dataset.fields, 0, self.limit, self.do_fill_table);
         });
     }
 });
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index ad91c28c559..4f4496b89bc 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -31,15 +31,14 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
  * Registry for all the main views
  */
 openerp.base.views = new openerp.base.Registry();
+
 openerp.base.ViewManager =  openerp.base.Controller.extend({
-    // This will be ViewManager Abstract/Common
     init: function(session, element_id, desactivate_sidebar) {
         this._super(session, element_id);
         this.action = null;
         this.dataset = null;
         this.searchview = null;
         this.active_view = null;
-        // this.views = { "list": { "view_id":1234, "controller": instance} }
         this.views = {};
         if (desactivate_sidebar)
             this.sidebar = null;
@@ -90,7 +89,11 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
 
         for (var i in this.views) {
             if (this.views[i].controller) {
-               this.views[i].controller.$element.toggle(i === view_type);
+                if (i === view_type) {
+                    this.views[i].controller.do_show();
+                } else {
+                    this.views[i].controller.do_hide();
+                }
             }
         }
         return view_promise;
@@ -123,15 +126,13 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
         if (this.searchview) {
             this.searchview.stop();
         }
+        var view_id = action.search_view_id ? action.search_view_id[0] || false : false;
 
-        var searchview = this.searchview = new openerp.base.SearchView(
-                this, this.session, this.element_id + "_search",
-                this.dataset, action.search_view_id[0] || false,
-                this.search_defaults());
-        searchview.on_search.add(function() {
+        this.searchview = new openerp.base.SearchView(this, this.session, this.element_id + "_search", this.dataset, view_id, this.search_defaults());
+        this.searchview.on_search.add(function() {
             self.views[self.active_view].controller.do_search.apply(self, arguments);
         });
-        return searchview.start();
+        return this.searchview.start();
     },
     do_action_window: function(action) {
         var self = this;
@@ -143,7 +144,7 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
 
         var searchview_loaded = this.setup_search_view(action);
 
-        this.$element.find('.views-switchers button').click(function() {
+        this.$element.find('.oe_vm_switch button').click(function() {
             self.on_mode_switch($(this).data('view-type'));
         });
         _.each(action.views, function(view) {
@@ -172,11 +173,11 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
     }
 });
 
-openerp.base.ViewManagerRoot = openerp.base.Controller.extend({
+openerp.base.ViewManagerRoot = openerp.base.ViewManager.extend({
 // Extends view manager
 });
 
-openerp.base.ViewManagerUsedAsAMany2One = openerp.base.Controller.extend({
+openerp.base.ViewManagerUsedAsAMany2One = openerp.base.ViewManager.extend({
 // Extends view manager
 });
 
@@ -314,6 +315,12 @@ openerp.base.CalendarView = openerp.base.Controller.extend({
     start: function () {
         this._super();
         this.$element.append('Calendar view');
+    },
+    do_show: function () {
+        this.$element.show();
+    },
+    do_hide: function () {
+        this.$element.hide();
     }
 });
 
@@ -322,28 +329,43 @@ openerp.base.GanttView = openerp.base.Controller.extend({
     start: function () {
         this._super();
         this.$element.append('Gantt view');
+    },
+    do_show: function () {
+        this.$element.show();
+    },
+    do_hide: function () {
+        this.$element.hide();
     }
 });
 
 openerp.base.views.add('tree', 'openerp.base.TreeView');
+openerp.base.TreeView = openerp.base.Controller.extend({
 /**
  * Genuine tree view (the one displayed as a tree, not the list)
  */
-openerp.base.TreeView = openerp.base.Controller.extend({
     start: function () {
         this._super();
         this.$element.append('Tree view');
+    },
+    do_show: function () {
+        this.$element.show();
+    },
+    do_hide: function () {
+        this.$element.hide();
     }
 });
 
-openerp.base.DiagramView = openerp.base.Controller.extend({
-});
-
 openerp.base.views.add('graph', 'openerp.base.GraphView');
 openerp.base.GraphView = openerp.base.Controller.extend({
     start: function () {
         this._super();
         this.$element.append('Graph view');
+    },
+    do_show: function () {
+        this.$element.show();
+    },
+    do_hide: function () {
+        this.$element.hide();
     }
 });
 
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 535d7291c59..7a82ef0447f 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -20,7 +20,7 @@
         
         
             

-                

+                

                 

             

         
@@ -32,13 +32,6 @@
             
         
     
-    
-        
-            

-                Debug:
-            

-        
-    
     
 
 
@@ -128,18 +121,18 @@
     
@@ -160,13 +153,15 @@
     

     

     
-        
-        

-            
-                
-            
-        

-        

+    
+    

         
-            

+            
         
+    

+    

+    
+        

+    
 	

 	
 	

 
 
-    

-    

-        
-        
-        0 / 0
-        
-        
+    

+    

+        
+        
+
+        0 / 0
+
+        
+        
     

     
     

@@ -256,10 +251,10 @@
     
 
 
-    
+    
 
 
-    

+    

         One2Many widget
     

 
@@ -281,11 +276,9 @@
     
 
 
-    

-
+    

     

         
-
         

             
             
diff --git a/addons/base_diagram/static/src/js/views.js b/addons/base_diagram/static/src/js/views.js
new file mode 100644
index 00000000000..606e1e5c78c
--- /dev/null
+++ b/addons/base_diagram/static/src/js/views.js
@@ -0,0 +1,12 @@
+/*---------------------------------------------------------
+ * OpenERP base library
+ *---------------------------------------------------------*/
+
+openerp.base_diagram = function(openerp) {
+
+openerp.base_diagram.DiagramView = openerp.base.Controller.extend({
+});
+
+};
+
+// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: