diff options
| author | vta vta@openerp.com <> | 2012-11-26 14:36:42 +0100 |
|---|---|---|
| committer | vta vta@openerp.com <> | 2012-11-26 14:36:42 +0100 |
| commit | fe993bca9cc607df1d2f1d8fa9bc52a9761f8b13 (patch) | |
| tree | 2c43b1ca051adb1b2c1313994381081571b8ab40 | |
| parent | 8374e20b10f0453f64234a90b8acb1bd6936be24 (diff) | |
[FIX] FIxed several views.
bzr revid: vta@openerp.com-20121126133642-bvj4go984ec6acko
| -rw-r--r-- | addons/portal/portal_data.xml | 49 | ||||
| -rw-r--r-- | addons/portal/portal_view.xml | 40 | ||||
| -rw-r--r-- | addons/portal_claim/portal_claim_view.xml | 72 | ||||
| -rw-r--r-- | addons/portal_crm/contact.py | 1 | ||||
| -rw-r--r-- | addons/portal_crm/contact_view.xml | 108 | ||||
| -rw-r--r-- | addons/portal_crm/static/src/css/portal_crm.css | 4 | ||||
| -rw-r--r-- | addons/portal_hr_employees/hr_employee.py | 5 | ||||
| -rw-r--r-- | addons/portal_hr_employees/hr_employee_view.xml | 25 | ||||
| -rw-r--r-- | addons/portal_hr_employees/static/src/css/portal_hr_employees.css | 5 | ||||
| -rw-r--r-- | addons/portal_project/portal_project_view.xml | 18 | ||||
| -rw-r--r-- | addons/portal_project_issue/portal_project_issue_view.xml | 5 | ||||
| -rw-r--r-- | addons/portal_project_issue/security/ir.model.access.csv | 2 | ||||
| -rw-r--r-- | addons/project/project_view.xml | 20 | ||||
| -rw-r--r-- | addons/project_issue/project_issue_view.xml | 4 |
14 files changed, 193 insertions, 165 deletions
diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml index d7550e0f2b4..4305e2d36ed 100644 --- a/addons/portal/portal_data.xml +++ b/addons/portal/portal_data.xml @@ -8,11 +8,28 @@ <field name="public">public</field> </record> - <record id="action_news" model="ir.actions.act_window"> + <record id="action_news" model="ir.actions.client"> <field name="name">News</field> - <field name="res_model">mail.group</field> - <field name="res_id" ref="company_news_feed"/> - <field name="view_mode">form</field> + <field name="tag">mail.wall</field> + <field name="model">mail.group</field> + <field name="params" eval="{ + 'domain': [ + ('model', '=', 'mail.group'), + ('res_id', '=', ref('company_news_feed')) + ], + 'context':{ + 'search_default_message_unread': True, + 'default_model': 'mail.group', + 'default_res_id': ref('company_news_feed'), + }, + 'res_model': 'mail.message', + 'thread_level': 1, + }"/> + <field name="help" type="html"> + <p> + Youd don't have unread company's news. + </p> + </field> </record> <!-- Mail group for the company's jobs --> @@ -21,11 +38,29 @@ <field name="public">public</field> </record> - <record id="action_jobs" model="ir.actions.act_window"> + <record id="action_jobs" model="ir.actions.client"> <field name="name">Jobs</field> - <field name="res_model">mail.group</field> + <field name="tag">mail.wall</field> + <field name="res_model">mail.message</field> <field name="res_id" ref="company_jobs"/> - <field name="view_mode">form</field> + <field name="params" eval="{ + 'domain':[ + ('model', '=', 'mail.group'), + ('res_id', '=', ref('company_jobs')) + ], + 'context':{ + 'search_default_message_unread': True, + 'default_model': 'mail.group', + 'default_res_id': ref('company_jobs'), + }, + 'res_model': 'mail.message', + 'thread_level': 1, + }"/> + <field name="help" type="html"> + <p> + Youd don't have unread job offers. + </p> + </field> </record> diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml index 1f291bb920e..313eb1e35af 100644 --- a/addons/portal/portal_view.xml +++ b/addons/portal/portal_view.xml @@ -9,7 +9,7 @@ sequence="20"/> <menuitem name="Messaging" id="portal_messages" parent="portal_menu" sequence="10"/> - <menuitem name="About Us" id="portal_company" parent="portal_menu" sequence="20"/> + <menuitem name="About Us" id="portal_company" parent="portal_menu" sequence="200"/> <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/> <menuitem name="Jobs" id="portal_jobs" parent="portal_company" sequence="20" action="action_jobs"/> @@ -17,9 +17,9 @@ Create menu items that we'll leave empty for now - they'll be filled up by other portal modules. --> - <menuitem name="Quotations and Sales Orders" id="portal_orders" parent="portal_menu" sequence="30"/> - <menuitem name="After Sale Services" id="portal_after_sales" parent="portal_menu" sequence="40"/> - <menuitem name="Projects" id="portal_projects" parent="portal_menu" sequence="50"/> + <menuitem name="Quotations and Sales Orders" id="portal_orders" parent="portal_menu" sequence="20"/> + <menuitem name="After Sale Services" id="portal_after_sales" parent="portal_menu" sequence="30"/> + <menuitem name="Projects" id="portal_projects" parent="portal_menu" sequence="40"/> <!-- extend res.groups search view --> <record id="group_search_view" model="ir.ui.view"> @@ -47,7 +47,37 @@ </field> </record> - <menuitem name="Notifications" id="portal_inbox" parent="portal_messages" + <record id="action_mail_inbox_feeds_portal" model="ir.actions.client"> + <field name="name">Inbox</field> + <field name="tag">mail.wall</field> + <field name="res_model">mail.message</field> + <field name="context">{ + 'default_model': 'res.users', + 'default_res_id': uid, + }</field> + <field name="params" eval=""{ + 'domain': [ + ('notification_ids.partner_id.user_ids', 'in', [uid]), + ('to_read', '=', True), + ('favorite_user_ids', 'not in', [uid]) + ], + 'show_compose_message': False, + 'view_mailbox': True, + 'view_inbox': True, + 'read_action': 'read' + }""/> + <field name="help" type="html"> + <p> + <b>Good Job!</b> Your inbox is empty. + </p><p> + Your inbox contains private messages or emails sent to you + as well as information related to documents or people you + follow. + </p> + </field> + </record> + + <menuitem name="Inbox" id="portal_inbox" parent="portal_messages" action="mail.action_mail_inbox_feeds" sequence="10"/> </data> diff --git a/addons/portal_claim/portal_claim_view.xml b/addons/portal_claim/portal_claim_view.xml index c7be419b889..cd0e4941286 100644 --- a/addons/portal_claim/portal_claim_view.xml +++ b/addons/portal_claim/portal_claim_view.xml @@ -1,79 +1,13 @@ <?xml version="1.0"?> <openerp> - <data> - - <record id="portal_crm_claim_kanban_view" model="ir.ui.view"> - <field name="name">CRM Claim Kanban</field> - <field name="model">crm.claim</field> - <field name="priority">20</field> - <field name="arch" type="xml"> - <kanban version="7.0" class="oe_portal_project_issue"> - <field name="name"/> - <field name="date"/> - <field name="priority"/> - <field name="date_deadline"/> - <field name="partner_id"/> - <field name="user_id"/> - <field name="categ_id"/> - <templates> - <t t-name="kanban-box"> - <div class="oe_kanban_card oe_kanban_global_click"> - <div class="oe_kanban_content"> - <div class="oe_portal_project_issue"> - <div><h1><field name="name"/></h1></div> - <div class="oe_kanban_footer_left"> - <field name="partner_id"/> - </div> - <t t-if="record.categ_id.raw_value"> - <div class="oe_left oe_tags"> - <span class="oe_tag oe_left" t-att-data-categ_id="record.categ_id.raw_value[0]"><t t-raw="record.categ_id.raw_value[1]"/></span> - </div> - </t> - <div class="oe_text_right"> - <h1><field name="stage_id" readonly="1"/></h1> - </div> - </div> - <div> - <div class="oe_right"> - Creation: <field name="date"/> - <span class="oe_kanban_highlight"> - <t t-set="priority" t-value="record.priority.raw_value || 5"/> - <a type="object" name="set_priority" args="['3']" t-if="priority gt 3" title="Normal Priority"> - <img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/> - </a> - <a type="object" name="set_priority" args="['5']" t-if="priority lte 3" title="Normal Priority"> - <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 3 ? 'on' : 'off'}.png" width="16" height="16"/> - </a> - <a type="object" name="set_priority" args="['2']" title="High Priority"> - <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 2 ? 'on' : 'off'}.png" width="16" height="16"/> - </a> - <a type="object" name="set_priority" args="['1']" title="Highest Priority"> - <img t-attf-src="/web/static/src/img/icons/star-#{priority == 1 ? 'on' : 'off'}.png" width="16" height="16"/> - </a> - </span> - <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())"> - <span t-attf-class="oe_kanban_status oe_kaban_status_red"> </span> - </t> - <t t-if="record.user_id"> - <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/> - </t> - </div> - </div> - </div> - <div class="oe_clear"/> - </div> - </t> - </templates> - </kanban> - </field> - </record> + <data> <record id="crm_case_categ_claim0" model="ir.actions.act_window"> <field name="name">Claims</field> <field name="res_model">crm.claim</field> <field name="view_type">form</field> - <field name="view_mode">tree,form,kanban,calendar</field> - <field name="view_id" ref="portal_crm_claim_kanban_view"/> + <field name="view_mode">tree,form,calendar</field> + <field name="view_id" ref="crm_claim.crm_case_claims_tree_view"/> <field name="context">{"search_default_user_id":'', "stage_type":'claim', "portal":'True'}</field> <field name="search_view_id" ref="crm_claim.view_crm_case_claims_filter"/> <field name="target">current</field> diff --git a/addons/portal_crm/contact.py b/addons/portal_crm/contact.py index c4d4e1d7f8c..132f4db34d5 100644 --- a/addons/portal_crm/contact.py +++ b/addons/portal_crm/contact.py @@ -95,7 +95,6 @@ class crm_contact_us(osv.TransientModel): it is quite complicated to set proper rights for this object. Therefore, user SUPERUSER_ID will perform the creation. """ - print values values['contact_name'] = values['partner_name'] crm_lead.create(cr, SUPERUSER_ID, dict(values,user_id=False), context) diff --git a/addons/portal_crm/contact_view.xml b/addons/portal_crm/contact_view.xml index 0241259a82a..8fa839dda8a 100644 --- a/addons/portal_crm/contact_view.xml +++ b/addons/portal_crm/contact_view.xml @@ -6,57 +6,60 @@ <field name="name">Contact form</field> <field name="model">portal_crm.crm_contact_us</field> <field name="arch" type="xml"> - <form string="Contact form" version="7.0"> - <sheet> - <h1>Contact us</h1> - <group class="oe_portal_crm_contact"> - <group col="6"> - <group class="oe_portal_crm_contact_form" colspan="4"> - <field name="partner_name"/> - <field name="email_from" placeholder="Your email..."/> - <field name="phone" placeholder="Your phone number..."/> - <field name="name" nolabel="1" placeholder="Subject..." colspan="6"/> - <field name="description" nolabel="1" placeholder="Content..." colspan="6"/> - <button string="Submit" name="submit" type="object"/> - </group> - <group class="oe_portal_crm_office"> - <field name="company_ids" nolabel="1" widget="many2many_kanban"> - <kanban> - <field name="name"/> - <field name="email"/> - <field name="phone"/> - <field name="street"/> - <field name="street2"/> - <field name="zip"/> - <field name="city"/> - <field name="country_id" options='{"no_open": True}'/> - <field name="state_id" options='{"no_open": True}'/> - <templates> - <t t-name="kanban-box"> - <h4><field name="name"/></h4> - <ul class="oe_portal_crm_address"> - <li t-if="record.street"><field name="street"/></li> - <li t-if="record.street2"><field name="street2"/></li> - <li t-if="record.zip"><field name="zip"/></li> - <li t-if="record.city"><field name="city"/></li> - <li t-if="record.country_id"><field name="country_id"/></li> - </ul> - <ul class="oe_portal_crm_contact_info"> - <li t-if="record.phone"><field name="phone"/></li> - <li t-if="record.email.raw_value"> - <a title="Mail" t-att-href="'mailto:'+record.email.value"> - <field name="email"/> - </a> - </li> - </ul> - </t> - </templates> - </kanban> - </field> - </group> - </group> + <form string="Contact form" version="7.0" class="oe_portal_crm_contact"> + <h1>Contact us</h1> + <div style="width: 300px; float:right;"> + <field name="company_ids" nolabel="1" widget="many2many_kanban" class="oe_portal_crm_office" colspan="2"> + <kanban> + <field name="name"/> + <field name="email"/> + <field name="phone"/> + <field name="street"/> + <field name="street2"/> + <field name="zip"/> + <field name="city"/> + <field name="country_id" options='{"no_open": True}'/> + <field name="state_id" options='{"no_open": True}'/> + <templates> + <t t-name="kanban-box"> + <h4><field name="name"/></h4> + <ul class="oe_portal_crm_address"> + <li t-if="record.street"><field name="street"/></li> + <li t-if="record.street2"><field name="street2"/></li> + <li t-if="record.zip"><field name="zip"/></li> + <li t-if="record.city"><field name="city"/></li> + <li t-if="record.country_id"><field name="country_id"/></li> + </ul> + <ul class="oe_portal_crm_contact_info"> + <li t-if="record.phone"><field name="phone"/></li> + <li t-if="record.email.raw_value"> + <a title="Mail" t-att-href="'mailto:'+record.email.value"> + <field name="email"/> + </a> + </li> + </ul> + </t> + </templates> + </kanban> + </field> + <div class="oe_portal_crm_team"> + + </div> + </div> + <div style="margin-right: 320px; max-width: 900px;"> + <group> + <group> + <field name="partner_name"/> + <field name="email_from" placeholder="Your email..."/> + <field name="phone" placeholder="Your phone number..."/> + </group> + <field name="name" placeholder="Subject..." nolabel="1" colspan="2"/> + <field name="description" String="Content" placeholder="Content..." nolabel="1" colspan="2"/> </group> - </sheet> + </div> + <div> + <button string="Submit" name="submit" type="object" class="oe_highlight"/> + </div> </form> </field> </record> @@ -68,7 +71,7 @@ <!-- give it a low priority to ensure this won't be the default view --> <field name="priority">99</field> <field name="arch" type="xml"> - <form string="Thank you"> + <form string="Thank you" version="7.0"> <!-- make sure there is at least one field in the view, otherwise the orm will try to select all the model's @@ -76,6 +79,9 @@ --> <field name="partner_name" invisible="1"/> <label string="Thank you for your interest, we'll respond to your request shortly."/> + <footer> + <button string="Close" class="oe_link" special="cancel" /> + </footer> </form> </field> </record> diff --git a/addons/portal_crm/static/src/css/portal_crm.css b/addons/portal_crm/static/src/css/portal_crm.css index 0589eb92e71..e322f1cb9da 100644 --- a/addons/portal_crm/static/src/css/portal_crm.css +++ b/addons/portal_crm/static/src/css/portal_crm.css @@ -1,8 +1,6 @@ /* Root container */ .openerp .oe_portal_crm_contact { - width: 800px; - margin: auto; - padding: 8px 0 0 0; + min-width: 960px; } /* Contact form section */ diff --git a/addons/portal_hr_employees/hr_employee.py b/addons/portal_hr_employees/hr_employee.py index bebcc450b01..94acea8c4aa 100644 --- a/addons/portal_hr_employees/hr_employee.py +++ b/addons/portal_hr_employees/hr_employee.py @@ -21,9 +21,9 @@ from osv import osv, fields -class crm_team(osv.TransientModel): +class crm_contact_us(osv.TransientModel): """ Add employees list to the portal's contact page """ - _name = 'crm.team' + _inherit = 'portal_crm.crm_contact_us' _description = 'Contact form for the portal' _columns = { 'employee_ids' : fields.many2many('hr.employee', string='Employees', readonly=True), @@ -51,6 +51,7 @@ class hr_employee(osv.osv): _columns = { 'visibility': fields.selection([('public', 'Public'),('private', 'Private')], string='Visibility', help='Employee\'s visibility in the portal\'s contact page'), + 'public_info': fields.text(), } _defaults = { 'visibility': 'private', diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml index f9e69dba71b..0584b6b8a4b 100644 --- a/addons/portal_hr_employees/hr_employee_view.xml +++ b/addons/portal_hr_employees/hr_employee_view.xml @@ -8,8 +8,9 @@ <field name="model">hr.employee</field> <field name="inherit_id" ref="hr.view_employee_form"/> <field name="arch" type="xml"> - <xpath expr="//field[@name='active']" position="before"> + <xpath expr="//field[@name='user_id']" position="after"> <field name="visibility"/> + <field name="public_info" String="Public Notes" placeholder="Here you can write information about you to be shown in the portal..." attrs='{"invisible":[("visibility", "=", "private")]}'/> </xpath> </field> </record> @@ -17,7 +18,7 @@ <!-- a kanban view of the employees to the portal's contact page --> <record id="portal_hr_employees_view" model="ir.ui.view"> <field name="name">portal_hr_employees_view</field> - <field name="model">crm.team</field> + <field name="model">portal_crm.crm_contact_us</field> <field name="arch" type="xml"> <form string="Our Team" version="7.0"> <field name="employee_ids" widget="many2many_kanban"> @@ -31,13 +32,14 @@ </div> <div class="oe_employee_details"> <h4> - <a type="open"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a> + <field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t> </h4> <ul> <li t-if="record.job_id.raw_value"><field name="job_id"/></li> <li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li> <li t-if="record.mobile_phone.raw_value">Mobile: <field name="mobile_phone"/></li> <li t-if="record.work_email.raw_value"><a t-attf-href="mailto:#{record.work_email.value}"><field name="work_email"/></a></li> + <li t-if="record.public_info.raw_value"><field name="public_info"/></li> </ul> </div> </div> @@ -51,15 +53,24 @@ <record id="action_team" model="ir.actions.act_window"> <field name="name">Meet the team</field> - <field name="res_model">crm.team</field> + <field name="res_model">portal_crm.crm_contact_us</field> <field name="view_id" ref="portal_hr_employees_view"/> <field name="view_mode">form</field> + <field name="view_type">tree</field> <field name="target">inline</field> - <field name="help">Here you can see our employees' public profile, if any.</field> </record> - <menuitem name="Meet the team" id="portal_company_team" - parent="portal.portal_company" action="action_team" sequence="50"/> + <record id="crm_contact_us" model="ir.ui.view"> + <field name="name">crm_contact_us</field> + <field name="model">portal_crm.crm_contact_us</field> + <field name="inherit_id" ref="portal_crm.contact_form_view"/> + <field name="arch" type="xml"> + <xpath expr="//div[@class='oe_portal_crm_team']" position="inside"> + <a href="#action=portal_hr_employees.action_team">Meet the team</a> + </xpath> + </field> + </record> + </data> </openerp> diff --git a/addons/portal_hr_employees/static/src/css/portal_hr_employees.css b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css index 5fa658de8c1..da511eaf2c0 100644 --- a/addons/portal_hr_employees/static/src/css/portal_hr_employees.css +++ b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css @@ -3,14 +3,13 @@ width: 100%; } .openerp .oe_portal_crm_contact .oe_portal_crm_team { - padding: 8px 0 0 0; + margin-top: 30px; + padding-top: 30px; } .openerp .oe_portal_crm_contact .oe_portal_crm_team .oe_employee_details { width: 170px; } .openerp .oe_portal_crm_contact .oe_portal_crm_team .oe_employee_image { - width: 65px; - height: 65px; } .openerp .oe_employee_vignette ul, .openerp .oe_employee_vignette li { diff --git a/addons/portal_project/portal_project_view.xml b/addons/portal_project/portal_project_view.xml index cfdaa4a602d..b7f3568545b 100644 --- a/addons/portal_project/portal_project_view.xml +++ b/addons/portal_project/portal_project_view.xml @@ -2,8 +2,24 @@ <openerp> <data> + <record id="open_view_project" model="ir.actions.act_window"> + <field name="name">Projects</field> + <field name="res_model">project.project</field> + <field name="view_type">form</field> + <field name="domain">[]</field> + <field name="view_mode">kanban,gantt</field> + <field name="view_id" ref="project.view_project_kanban"/> + <field name="search_view_id" ref="project.view_project_project_filter"/> + <field name="context">{}</field> + <field name="help" type="html"> + <p class="oe_view_nocontent_create"> + Click to start a new project. + </p> + </field> + </record> + <menuitem name="Projects" id="portal_services_projects" parent="portal.portal_projects" - action="project.open_view_project_all" sequence="10"/> + action="open_view_project" sequence="10"/> </data> </openerp> diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml index 52fb2866e59..3de7f1f903e 100644 --- a/addons/portal_project_issue/portal_project_issue_view.xml +++ b/addons/portal_project_issue/portal_project_issue_view.xml @@ -76,14 +76,11 @@ <p class="oe_view_nocontent_create"> Click to create an issue. </p><p> - You can track your claims from this menu and the action we + You can track your issues from this menu and the action we will take. </p> </field> </record> - <menuitem name="Issues" id="portal_after_sales_issues" parent="portal.portal_projects" - action="project_issue_categ_act0" sequence="20"/> - </data> </openerp> diff --git a/addons/portal_project_issue/security/ir.model.access.csv b/addons/portal_project_issue/security/ir.model.access.csv index 1669c217f54..80a38366b51 100644 --- a/addons/portal_project_issue/security/ir.model.access.csv +++ b/addons/portal_project_issue/security/ir.model.access.csv @@ -1,3 +1,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_issues,project_issue,project_issue.model_project_issue,portal.group_portal,1,0,1,0 +access_issues,project_issue,project_issue.model_project_issue,portal.group_portal,1,0,0,0 access_case_section,crm_case_section,crm.model_crm_case_section,portal.group_portal,1,0,0,0 diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 49a285ec8ae..a3cf6c4e4c0 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -227,7 +227,7 @@ <templates> <t t-name="kanban-box"> <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_global_click"> - <div class="oe_dropdown_toggle oe_dropdown_kanban"> + <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user"> <span class="oe_e">í</span> <ul class="oe_dropdown_menu"> <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Project Settings</a></li></t> @@ -488,7 +488,7 @@ <field name="arch" type="xml"> <kanban default_group_by="stage_id" > <field name="color"/> - <field name="priority" groups="base.group_user"/> + <field name="priority"/> <field name="stage_id"/> <field name="user_id"/> <field name="user_email"/> @@ -504,7 +504,7 @@ <templates> <t t-name="kanban-box"> <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click"> - <div class="oe_dropdown_toggle oe_dropdown_kanban"> + <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user"> <span class="oe_e">í</span> <ul class="oe_dropdown_menu"> <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t> @@ -531,12 +531,14 @@ <span t-attf-class="#{red || ''}"><i><field name="date_deadline"/></i></span> </div> <div class="oe_kanban_bottom_right"> - <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="In Progress" name="set_kanban_state_done" class="oe_kanban_status"> </a> - <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready for next stage" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a> - <a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a> - <a t-if="record.priority.raw_value == 2" type="object" string="Important" name="set_very_high_priority" class="oe_e oe_star_on">7</a> - <a t-if="record.priority.raw_value == 1 or record.priority.raw_value == 3 or record.priority.raw_value == 4" type="object" string="Normal" name="set_normal_priority" class="oe_e oe_star_off">7</a> - <a t-if="record.priority.raw_value == 0" type="object" string="Very Important" name="set_high_priority" class="oe_e oe_star_very_high_priority">7</a> + <div groups="base.group_user"> + <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="In Progress" name="set_kanban_state_done" class="oe_kanban_status"> </a> + <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready for next stage" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a> + <a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a> + <a t-if="record.priority.raw_value == 2" type="object" string="Important" name="set_very_high_priority" class="oe_e oe_star_on">7</a> + <a t-if="record.priority.raw_value == 1 or record.priority.raw_value == 3 or record.priority.raw_value == 4" type="object" string="Normal" name="set_normal_priority" class="oe_e oe_star_off">7</a> + <a t-if="record.priority.raw_value == 0" type="object" string="Very Important" name="set_high_priority" class="oe_e oe_star_very_high_priority">7</a> + </div> <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/> </div> <div class="oe_kanban_footer_left"> diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 037b90e18d7..463cd8c5101 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -249,7 +249,7 @@ </t> <t t-name="kanban-box"> <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_semantic_html_override"> - <div class="oe_dropdown_toggle oe_dropdown_kanban"> + <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user"> <span class="oe_e">i</span> <ul class="oe_dropdown_menu"> <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t> @@ -268,7 +268,7 @@ <field name="categ_ids"/> </div> <div class="oe_right"> - <span class="oe_kanban_highlight"> + <span class="oe_kanban_highlight" groups="base.group_user"> <t t-set="priority" t-value="record.priority.raw_value || 5"/> <a type="object" name="set_priority" args="['3']" t-if="priority gt 3" title="Normal Priority"> <img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/> |
