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

[FIX] Minor Changes For Selection Field.

Browse Source 
bzr revid: bth@tinyerp.com-20110727112617-rkr4zyu3kk3vvhcd
This commit is contained in:
Bhumi Thakkar (Open ERP)
2011-07-27 16:56:17 +05:30
parent 0e6ae57f11
commit 211d3b6194
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base/static/src/css/base.css
+2 -1
View File
@@ -1085,8 +1085,9 @@ background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */
vertical-align: top;
}
.treeview-td {
text-align: right;
text-align: left;
vertical-align: top;
padding-left: 15px;
}
.treeview-header {
text-align: left;
addons/base/static/src/js/tree.js
+5 -4
View File
@@ -64,13 +64,13 @@ openerp.base.TreeView = openerp.base.View.extend({
self.dataset.domain = [['parent_id', '=', parseInt(id, 10)]];
self.dataset.read_slice([], 0, false, function (response) {
var is_padding, row_id, record_id;
var curr_node = $('tr #treerow_' + id);
if (curr_node.length == 1) {
curr_node.find('td').children(':first-child').attr('src','/base/static/src/img/collapse.gif');
curr_node.after(QWeb.render('TreeView_Secondry', {'child_data': response, 'flag': '0' }));
curr_node.after(QWeb.render('TreeView_Secondry', {'child_data': response, 'flag': '0', 'selection_fields' : self.fields.type.selection }));
for (var i = 0; i < response.length; i++) {
row_id = $('tr #treerow_' + response[i].id);
@@ -109,11 +109,12 @@ openerp.base.TreeView = openerp.base.View.extend({
if (!flag) {
self.$element.find('table').remove();
}
self.$element.append(QWeb.render('TreeView_Secondry', {'child_data': response, 'flag' : '1', 'fields' : self.fields_view.fields , 'fields_view' : self.fields_view.arch.children }));
self.$element.append(QWeb.render('TreeView_Secondry', {'child_data': response, 'flag' : '1', 'fields' : self.fields_view.fields , 'fields_view' : self.fields_view.arch.children, 'selection_fields' : self.fields.type.selection}));
self.$element.find('tr[id ^= treerow_]').each( function() {
$(this).find('td').children(':first-child').addClass("parent_top");
if (!($(this).find('td').children(':first-child').attr('id'))) {
$(this).find('td').css('paddingLeft', '20px');
$(this).find('td:first').css('paddingLeft', '20px');
}
});
}
addons/base/static/src/xml/base.xml
+10 -2
View File
@@ -271,7 +271,11 @@
</span>
</td>
<td class="treeview-td">
<t t-esc="field.type" />
<t t-foreach="selection_fields" t-as="selection">
<t t-if="selection[0]==field.type">
<t t-esc="selection[1]" />
</t>
</t>
</td>
<td class="treeview-td">
<t t-esc="field.sequence" />
@@ -293,7 +297,11 @@
</span>
</td>
<td class="treeview-td">
<t t-esc="field.type" />
<t t-foreach="selection_fields" t-as="selection">
<t t-if="selection[0]==field.type">
<t t-esc="selection[1]" />
</t>
</t>
</td>
<td class="treeview-td">
<t t-esc="field.sequence" />