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

[MERGE] Merged with web/trunk.

Browse Source 
bzr revid: tde@openerp.com-20120711095636-gq3whaia3vm3n2lx
This commit is contained in:
Thibault Delavallée
2012-07-11 11:56:36 +02:00
parent 7ba80c40a0 a3b2a4e997
commit 14946ef758
5 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/xml/base.xml
+3 -3
View File
@@ -1467,11 +1467,11 @@
</t>
<t t-name="AbstractFormPopup.buttons">
<t t-if="! multi_select">
<button type="button" class="oe_button oe_abstractformpopup-form-save">Save</button>
<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-new">Save &amp; New</button>
<button type="button" class="oe_button oe_abstractformpopup-form-save">Save &amp; Close</button>
<button type="button" class="oe_button oe_abstractformpopup-form-save-new oe_highlight">Save &amp; New</button>
<button type="button" class="oe_button oe_abstractformpopup-form-save oe_highlight">Save &amp; Close</button>
</t>
<button type="button" class="oe_button oe_abstractformpopup-form-close">Cancel</button>
</t>
addons/web_kanban/static/src/css/Makefile
+3
View File
@@ -0,0 +1,3 @@
kanban.css: kanban.sass
sass -t expanded kanban.sass kanban.css
addons/web_kanban/static/src/css/kanban.css
+1 -3
View File
@@ -1,3 +1,4 @@
@charset "utf-8";
.openerp .oe_kanban_view {
height: inherit;
}
@@ -64,9 +65,6 @@
.openerp .oe_kanban_view .oe_kanban_column.oe_kanban_grouped, .openerp .oe_kanban_view .oe_kanban_group_header {
background: #f0eeee;
}
.openerp .oe_kanban_view .oe_kanban_group_header.oe_kanban_no_group {
display: none;
}
.openerp .oe_kanban_view .oe_kanban_column.oe_kanban_grouped, .openerp .oe_kanban_view .oe_kanban_group_header {
border-left: 1px solid #f0f8f8;
border-right: 1px solid #b9b9b9;
addons/web_kanban/static/src/css/kanban.sass
-3
View File
@@ -77,9 +77,6 @@
.oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header
background: #f0eeee
.oe_kanban_group_header.oe_kanban_no_group
display: none
.oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header
border-left: 1px solid #f0f8f8
border-right: 1px solid #b9b9b9
addons/web_kanban/static/src/js/kanban.js
+7 -9
View File
@@ -198,15 +198,13 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
var def = $.Deferred();
self.do_clear_groups();
self.dataset.read_slice(self.fields_keys.concat(['__last_update']), { 'limit': self.limit }).then(function(records) {
if (_.isEmpty(records)) {
self.no_result();
def.reject();
} else {
var kgroup = new instance.web_kanban.KanbanGroup(self, records, null, self.dataset);
self.do_add_groups([kgroup]).then(function() {
def.resolve();
});
}
var kgroup = new instance.web_kanban.KanbanGroup(self, records, null, self.dataset);
self.do_add_groups([kgroup]).then(function() {
if (_.isEmpty(records)) {
self.no_result();
}
def.resolve();
});
}).then(null, function() {
def.reject();
});