pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] bunch of minor issues

Browse Source 
bzr revid: xmo@openerp.com-20110906093516-3nkjngcmt2l3wex4
This commit is contained in:
Xavier Morel
2011-09-06 11:35:16 +02:00
parent 38960ee912 c076dc3e20
commit 6a2eb35006
14 changed files with 52 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/css/base-ie7.css
+1 -1
View File
@@ -1,4 +1,4 @@
.openerp .menu span {
min-width: 0px;
min-width: 0;
}
addons/web/static/src/css/base.css
+3 -3
View File
@@ -174,7 +174,7 @@ ul.db_options li {
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#949292', endColorstr='#5B5A5A',GradientType=0 ); /* IE6-9 */
border: none;
/* overriding jquery ui */
-moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px;
-moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
display: block;
font-weight: bold;
text-transform: uppercase;
@@ -324,7 +324,7 @@ label.error {
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#949292', endColorstr='#5B5A5A',GradientType=0 ); /* IE6-9 */
border: none;
/* overriding jquery ui */
-moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px;
-moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
}
.openerp .secondary_menu h4 {
padding: 0 0 2px 10px;
@@ -820,7 +820,7 @@ label.error {
padding: 2px;
}
.openerp td.oe_form_frame_cell.oe_form_group {
padding: 0px;
padding: 0;
}
.openerp .required.error {
border: 1px solid #900;
addons/web/static/src/js/boot.js
+2 -2
View File
@@ -56,8 +56,8 @@ openerp.web = function(instance) {
openerp.web.formats(instance);
openerp.web.chrome(instance);
openerp.web.data(instance);
files = ["views","search","list","form","list_editable","web_mobile","view_tree","data_export"];
for(i=0; i<files.length; i++) {
var files = ["views","search","list","form","list_editable","web_mobile","view_tree","data_export"];
for(var i=0; i<files.length; i++) {
if(openerp.web[files[i]]) {
openerp.web[files[i]](instance);
}
addons/web/static/src/js/core.js
+4 -5
View File
@@ -553,14 +553,13 @@ openerp.web.Session = openerp.web.CallbackEnabled.extend( /** @lends openerp.web
this.rpc('/web/session/modules', {}, function(result) {
self.module_list = result;
var lang = self.user_context.lang;
params = { mods: ["web"].concat(result), lang: lang};
var params = { mods: ["web"].concat(result), lang: lang};
self.rpc('/web/webclient/translations',params).then(function(transs) {
openerp.web._t.database.set_bundle(transs);
var modules = self.module_list.join(',');
var file_list = ["/web/static/lib/datejs/globalization/" +
self.user_context.lang.replace("_", "-") + ".js",
];
self.user_context.lang.replace("_", "-") + ".js"
];
if(self.debug) {
self.rpc('/web/webclient/csslist', {"mods": modules}, self.do_load_css);
self.rpc('/web/webclient/jslist', {"mods": modules}, function(files) {
@@ -987,7 +986,7 @@ openerp.web.TranslationDataBase = openerp.web.Class.extend({
var fcnt = function(str) {
var tmp = self.get(str);
return tmp === undefined ? str : tmp;
}
};
fcnt.database = this;
return fcnt;
},
addons/web/static/src/js/data.js
+2 -2
View File
@@ -622,7 +622,7 @@ openerp.web.BufferedDataSet = openerp.web.DataSetStatic.extend({
record = record || _.detect(this.to_write, function(x) {return x.id === id;});
var dirty = false;
if (record) {
for (k in data) {
for (var k in data) {
if (record.values[k] === undefined || record.values[k] !== data[k]) {
dirty = true;
break;
@@ -691,7 +691,7 @@ openerp.web.BufferedDataSet = openerp.web.DataSetStatic.extend({
}
}
setTimeout(function () {completion.resolve(records);}, 0);
}
};
if(to_get.length > 0) {
var rpc_promise = this._super(to_get, fields, function(records) {
_.each(records, function(record, index) {
addons/web/static/src/js/form.js
+8 -8
View File
@@ -214,7 +214,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
var ctx = widget.build_context ? widget.build_context() : {};
return ctx;
}
}
};
var parent_fields = null;
_.each(call[2].split(','), function(a, i) {
var field = _.trim(a);
@@ -1318,7 +1318,7 @@ openerp.web.form.dialog = function(content, options) {
var dialog = new openerp.web.Dialog(null, options);
dialog.$dialog = $(content).dialog(dialog.dialog_options);
return dialog.$dialog;
}
};
openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
init: function(view, node) {
@@ -1411,13 +1411,13 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
if (!self.$input.is(":focus") &&
!self.$input.autocomplete("widget").is(":visible") &&
!self.value) {
if(self.value === undefined && self.last_search.length > 0) {
if (self.value === undefined && self.last_search.length > 0) {
self._change_int_ext_value(self.last_search[0]);
} else {
self._change_int_ext_value(null);
}
}
}
};
this.$input.focusout(anyoneLoosesFocus);
var isSelecting = false;
@@ -1479,7 +1479,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
}});
}
// quick create
var raw_result = _(data.result).map(function(x) {return x[1];})
var raw_result = _(data.result).map(function(x) {return x[1];});
if (search_val.length > 0 &&
!_.include(raw_result, search_val) &&
(!self.value || search_val !== self.value[1])) {
@@ -2251,7 +2251,7 @@ openerp.web.form.FieldReference = openerp.web.form.Field.extend({
relation: null
}
}
}
};
this.get_fields_values = view.get_fields_values;
this.do_onchange = this.on_form_changed = this.on_nop;
this.widgets = {};
@@ -2361,7 +2361,7 @@ openerp.web.form.FieldBinary = openerp.web.form.Field.extend({
} else {
var url = '/web/binary/saveas?session_id=' + this.session.session_id + '&model=' +
this.view.dataset.model +'&id=' + (this.view.datarecord.id || '') + '&field=' + this.name +
'&fieldname=' + (this.node.attrs.filename || '') + '&t=' + (new Date().getTime())
'&fieldname=' + (this.node.attrs.filename || '') + '&t=' + (new Date().getTime());
window.open(url);
}
},
@@ -2419,7 +2419,7 @@ openerp.web.form.FieldBinaryImage = openerp.web.form.FieldBinary.extend({
this._super.apply(this, arguments);
this.set_image_maxwidth();
var url = '/web/binary/image?session_id=' + this.session.session_id + '&model=' +
this.view.dataset.model +'&id=' + (this.view.datarecord.id || '') + '&field=' + this.name + '&t=' + (new Date().getTime())
this.view.dataset.model +'&id=' + (this.view.datarecord.id || '') + '&field=' + this.name + '&t=' + (new Date().getTime());
this.$image.attr('src', url);
},
set_image_maxwidth: function() {
addons/web/static/src/js/views.js
+1 -1
View File
@@ -536,7 +536,7 @@ openerp.web.TranslateDialog = openerp.web.Dialog.extend({
self.$fields_form.find('.oe_trad_field[name="' + lg.code + '-' + f + '"]').val(values[0][f] || '').attr('data-value', values[0][f] || '');
});
deff.resolve();
}
};
if (lg.code === self.view_language) {
var values = {};
_.each(self.translatable_fields_keys, function(field) {
addons/web_calendar/static/src/js/calendar.js
+2 -2
View File
@@ -170,7 +170,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
value: filter_value,
label: (typeof filter === 'object') ? filter[1] : filter,
color: this.get_color(filter_value)
}
};
if (!sidebar_items[filter_value]) {
sidebar_items[filter_value] = filter_item;
}
@@ -224,7 +224,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
'text': res_text,
'id': evt.id,
'title': res_description.join()
}
};
if (evt.color) {
r.color = evt.color;
}
addons/web_dashboard/static/src/js/dashboard.js
+2 -2
View File
@@ -103,10 +103,10 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
self.actions_attrs[aid] = {
name: aid,
string: _.trim(result.result.name)
}
};
qdict.action = {
attrs : self.actions_attrs[aid]
}
};
self.$element.find('.oe-dashboard-column:first').prepend(QWeb.render('DashBoard.action', qdict));
self.do_save_dashboard();
self.on_load_action(result)
addons/web_gantt/static/src/js/gantt.js
+8 -8
View File
@@ -94,7 +94,7 @@ init: function(parent, element_id, dataset, view_id) {
COLOR_PALETTE = ['#ccccff', '#cc99ff', '#75507b', '#3465a4', '#73d216', '#c17d11', '#edd400',
'#fcaf3e', '#ef2929', '#ff00c9', '#ad7fa8', '#729fcf', '#8ae234', '#e9b96e', '#fce94f',
'#ff8e00', '#ff0000', '#b0008c', '#9000ff', '#0078ff', '#00ff00', '#e6ff00', '#ffff00',
'#905000', '#9b0000', '#840067', '#510090', '#0000c9', '#009b00', '#9abe00', '#ffc900']
'#905000', '#9b0000', '#840067', '#510090', '#0000c9', '#009b00', '#9abe00', '#ffc900'];
if (result.length != 0){
var show_event = [];
@@ -141,7 +141,7 @@ init: function(parent, element_id, dataset, view_id) {
var color = res[this.color_field][0] || res[this.color_field];
if (color_box[color] == undefined){
color_box[color] = COLOR_PALETTE[k];
k = k + 1;
k += 1;
}
if (this.date_stop != undefined){
@@ -156,8 +156,8 @@ init: function(parent, element_id, dataset, view_id) {
else{
var duration = res[this.date_delay];
}
if (duration == false)
duration = 0
if (!duration)
duration = 0;
if (self.grp.length){
for (var j in self.grp){
@@ -169,7 +169,7 @@ init: function(parent, element_id, dataset, view_id) {
grp_key = res[self.grp[j]['group_by']];
}
if (grp_key == false){
if (!grp_key){
grp_key = "Undefined";
}
@@ -233,7 +233,7 @@ init: function(parent, element_id, dataset, view_id) {
evt_date = all_events[evt_id]['evt'][2];
evt_duration = all_events[evt_id]['evt'][3];
evt_str_date = this.convert_date_str(evt_date);
var evt_str_date = this.convert_date_str(evt_date);
evt_end_date = this.end_date(evt_str_date, evt_duration);
while (all_events[evt_id]['parent'] != "") {
@@ -396,14 +396,14 @@ init: function(parent, element_id, dataset, view_id) {
"type":"ir.actions.act_window",
"view_type":"form",
"view_mode":"form"
}
};
action.flags = {
search_view: false,
sidebar : false,
views_switcher : false,
pager: false
}
};
var element_id = _.uniqueId("act_window_dialog");
var dialog = jQuery('<div>', {
'id': element_id
addons/web_mobile/static/src/js/chrome_mobile.js
+9 -23
View File
@@ -13,7 +13,6 @@ openerp.web_mobile.mobilewebclient = function(element_id) {
openerp.web_mobile.MobileWebClient = openerp.web.Widget.extend({
init: function(element_id) {
var self = this;
this._super(null, element_id);
QWeb.add_template("xml/web_mobile.xml");
var params = {};
@@ -30,9 +29,6 @@ openerp.web_mobile.MobileWebClient = openerp.web.Widget.extend({
});
openerp.web_mobile.Login = openerp.web.Widget.extend({
init: function(session, element_id) {
this._super(session, element_id);
},
start: function() {
var self = this;
jQuery("#oe_header").children().remove();
@@ -116,8 +112,8 @@ openerp.web_mobile.Header = openerp.web.Widget.extend({
self.$element.find("a").click(this.on_clicked);
},
on_clicked: function(ev) {
$opt = $(ev.currentTarget);
current_id = $opt.attr('id');
var $opt = $(ev.currentTarget);
var current_id = $opt.attr('id');
if (current_id == 'home') {
this.homepage = new openerp.web_mobile.HomePage(this, "oe_app");
this.homepage.start();
@@ -132,14 +128,14 @@ openerp.web_mobile.Shortcuts = openerp.web.Widget.extend({
start: function() {
var self = this;
this.rpc('/web/session/sc_list',{} ,function(res){
self.$element.html(QWeb.render("Shortcuts", {'sc' : res}))
self.$element.html(QWeb.render("Shortcuts", {'sc' : res}));
self.$element.find("a").click(self.on_clicked);
})
},
on_clicked: function(ev) {
$shortcut = $(ev.currentTarget);
id = $shortcut.data('menu');
res_id = $shortcut.data('res');
var $shortcut = $(ev.currentTarget);
var id = $shortcut.data('menu');
var res_id = $shortcut.data('res');
jQuery("#oe_header").find("h1").html($shortcut.data('name'));
this.listview = new openerp.web_mobile.ListView(this, "oe_app", res_id);
this.listview.start();
@@ -162,7 +158,7 @@ openerp.web_mobile.Menu = openerp.web.Widget.extend({
this.$element.add(this.$secondary_menu).find("a").click(this.on_menu_click);
},
on_menu_click: function(ev, id) {
$menu = $(ev.currentTarget);
var $menu = $(ev.currentTarget);
id = $menu.data('menu');
for (var i = 0; i < this.data.data.children.length; i++) {
if (this.data.data.children[i].id == id) {
@@ -190,7 +186,7 @@ openerp.web_mobile.Secondary = openerp.web.Widget.extend({
this.$element.add(this.$secondary_menu).find("a").click(this.on_menu_click);
},
on_menu_click: function(ev, id) {
$menu = $(ev.currentTarget);
var $menu = $(ev.currentTarget);
id = $menu.data('menu');
for (var i = 0; i < this.data.children.length; i++) {
if (this.data.children[i].id == id) {
@@ -217,9 +213,6 @@ openerp.web_mobile.Secondary = openerp.web.Widget.extend({
});
openerp.web_mobile.Options = openerp.web.Widget.extend({
init: function(session, element_id) {
this._super(session, element_id);
},
start: function() {
var self = this;
this.$element.html(QWeb.render("Options", this));
@@ -233,17 +226,10 @@ openerp.web_mobile.Options = openerp.web.Widget.extend({
});
openerp.web_mobile.Selection = openerp.web.Widget.extend({
init: function (){
this._super();
},
start: function(){
this._super();
var self = this;
},
on_select_option: function(ev){
ev.preventDefault();
var $this = ev.currentTarget;
$($this).prev().find(".ui-btn-text").html($($this).find("option:selected").text());
}
});
}
};
addons/web_mobile/static/src/js/form_mobile.js
+4 -4
View File
@@ -18,9 +18,9 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
},
start: function() {
var self = this;
id = this.list_id;
model = this.action.res_model;
view_id = this.action.views[1][0];
var id = this.list_id;
var model = this.action.res_model;
var view_id = this.action.views[1][0];
this.dataset = new openerp.web.DataSetSearch(this, this.action.res_model, null, null);
this.dataset.read_slice([],{}, function (result) {
for (var i = 0; i < result.length; i++) {
@@ -128,4 +128,4 @@ openerp.web_mobile.FormView = openerp.web.Widget.extend({
next.addClass(this.collapsed_class);
}
});
}
};
addons/web_mobile/static/src/js/list_mobile.js
+3 -3
View File
@@ -63,11 +63,11 @@ openerp.web_mobile.ListView = openerp.web.Widget.extend({
});
},
on_list_click: function(ev) {
$record = $(ev.currentTarget);
var $record = $(ev.currentTarget);
var self = this;
id = $record.data('id');
var id = $record.data('id');
this.formview = new openerp.web_mobile.FormView(this, "oe_app", id, this.action);
this.formview.start();
}
});
}
};
addons/web_mobile/static/src/web_mobile.html
+3 -2
View File
@@ -15,7 +15,7 @@
<script type="text/javascript" src="/web_mobile/static/lib/jquery_mobile/js/jquery.mobile-1.0a4.1.js"></script>
<script type="text/javascript" src="/base/static/lib/qweb/qweb2.js"></script>
<script type="text/javascript" src="/base/static/src/js/boot.js"></script>
<script type="text/javascript" src="/base/static/src/js/boot.js"></script>
<script type="text/javascript" src="/base/static/src/js/core.js"></script>
<script type="text/javascript" src="/base/static/src/js/chrome.js"></script>
<script type="text/javascript" src="/base/static/src/js/data.js"></script>
@@ -27,6 +27,7 @@
<script type="text/javascript" src="/web_mobile/static/src/js/form_mobile.js"></script>
<script type="text/javascript">
var QWeb;
$(function() {
QWeb = window.QWeb || new QWeb2.Engine();
var oe = openerp.init();
@@ -38,4 +39,4 @@
<body>
<div id="moe" class="openerp"></div>
</body>
</html>
</html>