Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/trunk-kanban-issue-dka into lp:openerp-web

  1. trunk-kanban-issue-dka
  2. Merge into trunk
Proposed by Darshan Kalola(OpenERP)
Status: Merged
Merged at revision: 3982
Proposed branch: lp:~openerp-dev/openerp-web/trunk-kanban-issue-dka
Merge into: lp:openerp-web
Diff against target: 40 lines (+5/-4)
1 file modified
addons/web_kanban/static/src/xml/web_kanban.xml (+5/-4)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/trunk-kanban-issue-dka
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+209240@code.launchpad.net

Description of the change

 Hello,

      I have fixed the following points in kanban view,

          1.remaining hours: must not be visibile in the kanban columns of tasks if = 0,
          2.show add/delete/edit icon on the basis of access right.

    Thanks,
    Darshan

To post a comment you must log in.
lp:~openerp-dev/openerp-web/trunk-kanban-issue-dka updated
3952. By Darshan Kalola(OpenERP)

[MERGE]sync with trunk.

3953. By Darshan Kalola(OpenERP)

[MERGE]sync with trunk.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'addons/web_kanban/static/src/xml/web_kanban.xml'
--- addons/web_kanban/static/src/xml/web_kanban.xml 2014-02-21 13:17:28 +0000
+++ addons/web_kanban/static/src/xml/web_kanban.xml 2014-04-15 09:21:52 +0000
@@ -18,7 +18,7 @@
18 <button type="button" class="oe_kanban_button_new oe_highlight">18 <button type="button" class="oe_kanban_button_new oe_highlight">
19 <t t-esc="widget.options.create_text || _t('Create')"/>19 <t t-esc="widget.options.create_text || _t('Create')"/>
20 </button>20 </button>
21 <span class="oe_alternative" style="display: none">21 <span t-if="widget.is_action_enabled('group_create')" class="oe_alternative" style="display: none">
22 <span class="oe_fade">or</span>22 <span class="oe_fade">or</span>
23 <div class="oe_bounce_container">23 <div class="oe_bounce_container">
24 <a href="#" class="oe_bold oe_kanban_add_column">Add a new column</a>24 <a href="#" class="oe_bold oe_kanban_add_column">Add a new column</a>
@@ -30,6 +30,7 @@
30<t t-name="KanbanView.group_header">30<t t-name="KanbanView.group_header">
31 <td class="oe_kanban_group_header">31 <td class="oe_kanban_group_header">
32 <t t-if="widget.view.group_by">32 <t t-if="widget.view.group_by">
33 <t t-set="parent" t-value="(widget.getParent())"/>
33 <div class="oe_kanban_header oe_semantic_html_override">34 <div class="oe_kanban_header oe_semantic_html_override">
34 <t t-if="widget.view._is_quick_create_enabled()">35 <t t-if="widget.view._is_quick_create_enabled()">
35 <div class="oe_kanban_add oe_e" title="Quick create">]</div>36 <div class="oe_kanban_add oe_e" title="Quick create">]</div>
@@ -44,8 +45,8 @@
44 <ul class="oe_dropdown_menu oe_kanban_group_dropdown">45 <ul class="oe_dropdown_menu oe_kanban_group_dropdown">
45 <li><a data-action="toggle_fold" href="#">Fold</a></li>46 <li><a data-action="toggle_fold" href="#">Fold</a></li>
46 <t t-if="widget.view.grouped_by_m2o and widget.value">47 <t t-if="widget.view.grouped_by_m2o and widget.value">
47 <li><a data-action="edit" href="#">Edit</a></li>48 <li t-if="parent.is_action_enabled('group_edit')"><a data-action="edit" href="#">Edit</a></li>
48 <li><a data-action="delete" href="#">Delete</a></li>49 <li t-if="parent.is_action_enabled('group_delete')"><a data-action="delete" href="#">Delete</a></li>
49 </t>50 </t>
50 </ul>51 </ul>
51 </div>52 </div>
@@ -56,7 +57,7 @@
56 </div>57 </div>
57 <div class="oe_kanban_group_title_text" t-att-title="widget.title"><t t-esc="widget.title"/></div>58 <div class="oe_kanban_group_title_text" t-att-title="widget.title"><t t-esc="widget.title"/></div>
58 </div>59 </div>
59 <ul class="oe_kanban_aggregates">60 <ul t-if="widget.group.get('length') &gt; 0" class="oe_kanban_aggregates">
60 <li t-foreach="widget.aggregates" t-as="aggregate">61 <li t-foreach="widget.aggregates" t-as="aggregate">
61 <span><t t-esc="aggregate"/>:</span> <t t-esc="aggregate_value"/>62 <span><t t-esc="aggregate"/>:</span> <t t-esc="aggregate_value"/>
62 </li>63 </li>