Bhumi Thakkar (Open ERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-improve-css-FF-IE-database-bth into
lp:~openerp-dev/openerp-web/trunk-improve-css-FF-IE.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-improve-css-FF-IE-database-bth/+merge/124884
Hello,
Remove class 'oe_form_field' from td tag for selection field.
Thanks,
Bhumi
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-improve-css-FF-IE-database-bth/+merge/124884
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openerp-web/trunk-improve-css-FF-IE-database-bth into
lp:~openerp-dev/openerp-web/trunk-improve-css-FF-IE.
=== modified file 'addons/web/static/src/js/views.js'
--- addons/web/static/src/js/views.js 2012-09-13 19:27:59 +0000
+++ addons/web/static/src/js/views.js 2012-09-18 10:52:28 +0000
@@ -327,7 +327,7 @@
}
this.dialog_stop();
},
- ir_actions_server: function (action, on_closed) {
+ ir_actions_server: function (action, on_closed, clear_breadcrumbs) {
var self = this;
this.rpc('/web/action/run', {
action_id: action.id,
=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml 2012-09-16 20:40:29 +0000
+++ addons/web/static/src/xml/base.xml 2012-09-18 10:52:28 +0000
@@ -132,7 +132,7 @@
</tr>
<tr>
<td><label for="db_lang">Default language:</label></td>
- <td class="oe_form_field oe_form_field_selection ">
+ <td class="oe_form_field_selection ">
<select name="db_lang" t-if="widget.lang_list">
<t t-foreach="widget.lang_list" t-as="lang">
<option t-att-value="lang[0]" t-att-selected="lang[0] === 'en_US' ? 'selected' : undefined">
@@ -166,7 +166,7 @@
<table align="center" class="db_option_table">
<tr>
<td><label for="drop_db">Database:</label></td>
- <td class="oe_form_field oe_form_field_selection">
+ <td class="oe_form_field_selection">
<select t-if="widget.db_list" name="drop_db" autofocus="autofocus">
<t t-foreach="widget.db_list" t-as="db">
<option t-att-value="db">
@@ -198,7 +198,7 @@
<table align="center" class="db_option_table">
<tr>
<td><label for="backup_db">Database:</label></td>
- <td class="oe_form_field oe_form_field_selection ">
+ <td class="oe_form_field_selection ">
<select t-if="widget.db_list" name="backup_db" autofocus="autofocus">
<t t-foreach="widget.db_list" t-as="db">
<option t-att-value="db">
@@ -1237,8 +1237,8 @@
<button type="button" class="oe_button oe_abstractformpopup-form-save oe_highlight">Save</button>
</t>
<t t-if="multi_select">
+ <button type="button" class="oe_button oe_abstractformpopup-form-save oe_highlight">Save & Close</button>
<button type="button" class="oe_button oe_abstractformpopup-form-save-new oe_highlight">Save & New</button>
- <button type="button" class="oe_button oe_abstractformpopup-form-save oe_highlight">Save & Close</button>
</t>
or
</t>
=== modified file 'addons/web_graph/controllers/graph.py'
--- addons/web_graph/controllers/graph.py 2012-05-07 23:19:45 +0000
+++ addons/web_graph/controllers/graph.py 2012-09-18 10:52:28 +0000
@@ -52,6 +52,9 @@
def _convert(field, data, tick=True):
if fields[field]['type']=='many2one':
data = data and data[1]
+ elif (fields[field]['type']=='selection') and (type(fields[field]['selection']) in (list, tuple)):
+ d = dict(fields[field]['selection'])
+ data = d[data]
if tick:
return ticks.setdefault(data, len(ticks))
return data or 0
=== modified file 'addons/web_graph/static/src/js/graph.js'
--- addons/web_graph/static/src/js/graph.js 2012-08-24 18:27:07 +0000
+++ addons/web_graph/static/src/js/graph.js 2012-09-18 10:52:28 +0000
@@ -142,9 +142,11 @@
options_bar: function (data) {
var min = _(data.data).chain()
.map(function (record) {
- return _.min(record.data, function (item) {
- return item[1];
- })[1];
+ if (record.data.length > 0){
+ return _.min(record.data, function (item) {
+ return item[1];
+ })[1];
+ }
}).min().value();
return {
bars : {
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
