diff options
| author | Gaurav Panchal <gan@openerp.com> | 2014-06-23 11:48:05 +0530 |
|---|---|---|
| committer | Gaurav Panchal <gan@openerp.com> | 2014-06-23 11:48:05 +0530 |
| commit | b8124f5ceca5f0308e53d4f33e73c7a778de2302 (patch) | |
| tree | 85df250d32575cb1ac6e774bbff7075ecacbd6c2 | |
| parent | e862ff7033dd001a84d7e0a192d0da7b11384bd9 (diff) | |
[IMP]document: Remove document menu and submenu from knowledge, hr_applicnt_document: add kanban view in hr resume and letter, mail: change the kanban view of attachment
| -rw-r--r-- | addons/document/document_view.xml | 8 | ||||
| -rw-r--r-- | addons/hr_applicant_document/views/hr_applicant.xml | 5 | ||||
| -rw-r--r-- | addons/mail/mail_message_view.xml | 22 |
3 files changed, 18 insertions, 17 deletions
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index 87da74c5658..4e19478e205 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -253,14 +253,6 @@ </p> </field> </record> - <menuitem name="Documents" id="menu_document_doc" parent="knowledge.menu_document" sequence="0"/> - <menuitem - name="Documents" - action="action_document_file_form" - id="menu_document_files" - parent="menu_document_doc" - sequence="0" - /> <record model="ir.actions.act_window" id="action_document_file_directory_form"> <field name="type">ir.actions.act_window</field> diff --git a/addons/hr_applicant_document/views/hr_applicant.xml b/addons/hr_applicant_document/views/hr_applicant.xml index 706a1b4c754..71607014c85 100644 --- a/addons/hr_applicant_document/views/hr_applicant.xml +++ b/addons/hr_applicant_document/views/hr_applicant.xml @@ -16,8 +16,9 @@ <record model="ir.actions.act_window" id="hr_applicant_resumes"> <field name="name">Resumes and Letters</field> <field name="res_model">ir.attachment</field> - <field name="view_mode">tree,form</field> - <field name="view_id" ref="document.view_document_file_tree"/> + <field name="view_type">form</field> + <field name="view_mode">kanban,tree,form</field> + <field name="view_id" ref="mail.view_document_file_kanban"/> <field name="domain">[('res_model','=','hr.applicant')]</field> <field name="help" type="html"> <p> diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml index dde087de597..0ab7b269cca 100644 --- a/addons/mail/mail_message_view.xml +++ b/addons/mail/mail_message_view.xml @@ -100,13 +100,21 @@ <templates> <t t-name="kanban-box"> <div class="oe_kanban_global_click"> - <div t-attf-class="oe_attachment" t-if="record.file_type_icon.value != 'webimage'"> - <img t-att-src="'/mail/static/src/img/mimetypes/' + record.file_type_icon.value + '.png'"></img> - <div class='oe_name'><t t-raw='record.name.value' />bb</div> - </div> - <div t-attf-class="oe_attachment oe_preview" t-if="record.file_type_icon.value == 'webimage'"> - <img t-att-src="kanban_image('ir.attachment', 'datas', record.id.value)" class="oe_kanban_image"/> - <div class='oe_name'><t t-raw='record.name.value' />aa</div> + <div class="oe_kanban_vignette"> + <div class="oe_attachment"> + <div t-if="record.file_type_icon.value != 'webimage'"> + <img t-att-src="'/mail/static/src/img/mimetypes/' + record.file_type_icon.value + '.png'"></img> + </div> + <div t-if="record.file_type_icon.value == 'webimage' and !record.url.value"> + <img t-att-src="kanban_image('ir.attachment', 'datas', record.id.value)"/> + </div> + <div t-if="record.file_type_icon.value and record.url.value"> + <img t-att-src="record.url.value"/> + </div> + <div class="oe_name"> + <field name="name"/> + </div> + </div> </div> </div> </t> |