odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE]3 issue solved by pan. 

bzr revid: vme@tinyerp.com-20130201125523-oz29m2fog3dht1ha
This commit is contained in:
Vidhin Mehta 2013-02-01 18:25:23 +05:30
parent 32ca8ce3da a3a2e4c396
commit 00e4509bf4
6 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/web/static/src/css/base.css
View File

@ -522,6 +522,7 @@
}
.openerp .oe_grey {
color: #aaaaaa;
height: 30px;
}
.openerp .oe_tag {
border: 1px solid #afafb6;

1
addons/web/static/src/css/base.sass
View File

@ -461,6 +461,7 @@ $sheet-padding: 16px
max-width: 650px
.oe_grey
color: #aaa
height: 30px
// }}}

6
addons/web/static/src/js/view_list.js
View File

@ -587,8 +587,10 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
* @param {Array} ids the ids of the records to delete
*/
do_delete: function (ids) {
if (!(ids.length && confirm(_t("Do you really want to remove these records?")))) {
return;
if (!this.m2m_field){
if (!(ids.length && confirm(_t("Are you sure?"))) && (this.m2m_field)) {
return;
}
}
var self = this;
return $.when(this.dataset.unlink(ids)).done(function () {

6
addons/web_kanban/static/src/css/kanban.css
View File

@ -173,7 +173,7 @@
display: none;
position: relative;
opacity: 0.75;
top: 20px;
top: 26px;
}
.openerp .oe_kanban_view .oe_kanban_add, .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {
margin-left: 4px;
@ -186,6 +186,10 @@
.openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {
top: -2px;
}
.openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle .oe_kanban_group_length {
margin: 7px 1px -15px 2px;
font-weight: bold;
}
.openerp .oe_kanban_view .oe_kanban_card, .openerp .oe_kanban_view .oe_dropdown_toggle {
cursor: pointer;
display: inline-block;

5
addons/web_kanban/static/src/css/kanban.sass
View File

@ -189,7 +189,7 @@
display: none
position: relative
opacity: 0.75
top: 20px
top: 26px
// }}}
// KanbanQuickCreate {{{
.oe_kanban_add, .oe_kanban_header .oe_dropdown_toggle
@ -200,6 +200,9 @@
top: -8px
.oe_kanban_header .oe_dropdown_toggle
top: -2px
.oe_kanban_group_length
margin: 7px 1px -15px 2px
font-weight: bold
.oe_kanban_card, .oe_dropdown_toggle
cursor: pointer
display: inline-block

3
addons/web_kanban/static/src/xml/web_kanban.xml
View File

@ -35,6 +35,9 @@
<div class="oe_kanban_add oe_e" title="Quick create">]</div>
</t>
<div class="oe_dropdown_toggle oe_dropdown_kanban">
<div class="oe_kanban_group_length oe_tag">
<t t-if="widget.group.get('length') &gt; 99"> 99+ </t><t t-if="widget.group.get('length') &lt;= 99"> <t t-esc="widget.group.get('length')"/> </t>
</div>
<span class="oe_e">í</span>
<ul class="oe_dropdown_menu oe_kanban_group_dropdown">
<li><a data-action="toggle_fold" href="#">Fold</a></li>