diff options
4 files changed, 14 insertions, 32 deletions
diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml index 97a5c9d2b2f..9bfdbe1524a 100644 --- a/addons/portal_project_issue/portal_project_issue_view.xml +++ b/addons/portal_project_issue/portal_project_issue_view.xml @@ -24,9 +24,9 @@ <field name="version_id"/> </div> <div class="oe_kanban_footer_left"> - <div class="oe_left"> + <div class="oe_left oe_field_many2many_tags"> <t t-foreach="record.categ_ids.raw_value" t-as="categ_id"> - <span class="oe_form_field_many2manytags_box" t-att-data-categ_id="categ_id"></span> + <span class="oe_field_many2many_tag" t-att-data-categ_id="categ_id"></span> </t> </div> <div class="oe_right"> diff --git a/addons/portal_project_issue/static/src/css/portal_project_issue.css b/addons/portal_project_issue/static/src/css/portal_project_issue.css index cfc871748d8..3ad30208d6d 100644 --- a/addons/portal_project_issue/static/src/css/portal_project_issue.css +++ b/addons/portal_project_issue/static/src/css/portal_project_issue.css @@ -26,26 +26,3 @@ font-size: 1.2em; font-weight: bold; } - -.oe_portal_project_issue .oe_fold_column.oe_kanban_record .oe_kanban_footer_left { - height: 24px; -} - -/* many2many tags */ -.oe_portal_project_issue * span.oe_form_field_many2manytags_box { - display: none; /* display it only after the names have been set - cf. portal_project_issue.js */ - border-radius: 2px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - position: relative; - float: left; - border: 1px solid #9DACCC; - background: #E2E6F0; - color: black; - padding: 0px 3px 0px 3px; - margin: 0 2px 2px 0; - height: 16px; - font: 11px "lucida grande", tahoma, verdana, arial, sans-serif; -} diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 0712026799b..c8250edcafd 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -44,7 +44,7 @@ openerp.project = function(openerp) { dataset.read_slice(['id', 'name']).then(function(result) { _.each(result, function(v, k) { // Set the proper value in the DOM and display the element - self.$element.find('span[data-categ_id=' + v.id + ']').text(v.name).toggle(); + self.$element.find('span[data-categ_id=' + v.id + ']').text(v.name); }); }); }, diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index eeed1fb3821..91bbb5084a1 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -16,9 +16,9 @@ <record id="action_project_issue_unread" model="ir.values"> <field name="name">action_project_issue_unread</field> <field name="action_id" ref="actions_server_project_issue_unread"/> - <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_issue_unread'))" /> + <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_issue_unread'))"/> <field name="key">action</field> - <field name="model_id" ref="model_project_issue" /> + <field name="model_id" ref="model_project_issue"/> <field name="model">project.issue</field> <field name="key2">client_action_multi</field> </record> @@ -34,9 +34,9 @@ <record id="action_project_issue_read" model="ir.values"> <field name="name">action_project_issue_read</field> <field name="action_id" ref="actions_server_project_issue_read"/> - <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_issue_read'))" /> + <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_issue_read'))"/> <field name="key">action</field> - <field name="model_id" ref="model_project_issue" /> + <field name="model_id" ref="model_project_issue"/> <field name="model">project.issue</field> <field name="key2">client_action_multi</field> </record> @@ -204,7 +204,7 @@ <separator orientation="vertical"/> <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/> <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/> - <filter string="Unassigned Issues" domain="[('user_id','=',False)]" help="Unassigned Issues" icon="terp-personal-" /> + <filter string="Unassigned Issues" domain="[('user_id','=',False)]" help="Unassigned Issues" icon="terp-personal-"/> <separator orientation="vertical"/> <field name="user_id"/> <field name="project_id"/> @@ -290,6 +290,11 @@ <field name="version_id"/> </div> <div class="oe_kanban_footer_left"> + <div class="oe_left oe_field_many2many_tags"> + <t t-foreach="record.categ_ids.raw_value" t-as="categ_id"> + <span class="oe_field_many2many_tag" t-att-data-categ_id="categ_id"></span> + </t> + </div> <div class="oe_right"> <span class="oe_kanban_highlight"> <t t-set="priority" t-value="record.priority.raw_value || 5"/> @@ -427,7 +432,7 @@ <separator colspan="4" string="Project Management" name="project_sep"/> <!-- removal of invisible attribute --> </xpath> <xpath expr='//separator[@name="project_sep"]' position='after'> - <field name="use_issues" /> + <field name="use_issues"/> </xpath> </field> </record> |