Merge branch 'master' of github.com:openlabs/nereid-project
This commit is contained in:
commit
47c6f03f59
23
project.py
23
project.py
|
@ -62,29 +62,6 @@ class WebSite(ModelSQL, ModelView):
|
|||
WebSite()
|
||||
|
||||
|
||||
class IrAttachment(ModelSQL, ModelView):
|
||||
"Ir Attachment"
|
||||
_name = 'ir.attachment'
|
||||
|
||||
uploaded_by = fields.Many2One('nereid.user', 'Uploaded By')
|
||||
|
||||
def create(self, values):
|
||||
"""
|
||||
Update create to save uploaded by
|
||||
|
||||
:param values: A dictionary
|
||||
"""
|
||||
if has_request_context():
|
||||
values['uploaded_by'] = request.nereid_user.id
|
||||
#else:
|
||||
# TODO: try to find the nereid user from the employee
|
||||
# if an employee made the update
|
||||
|
||||
return super(IrAttachment, self).create(values)
|
||||
|
||||
IrAttachment()
|
||||
|
||||
|
||||
class ProjectUsers(ModelSQL):
|
||||
_name = 'project.work-nereid.user'
|
||||
_table = 'project_work_nereid_user_rel'
|
||||
|
|
6
urls.xml
6
urls.xml
|
@ -12,6 +12,12 @@
|
|||
<field name="sequence" eval="05" />
|
||||
<field name="url_map" ref="nereid.default_url_map" />
|
||||
</record>
|
||||
<record id="project_home" model="nereid.url_rule">
|
||||
<field name="rule">/<language>/projects</field>
|
||||
<field name="endpoint">project.work.home</field>
|
||||
<field name="sequence" eval="05" />
|
||||
<field name="url_map" ref="nereid.default_url_map" />
|
||||
</record>
|
||||
<record id="create_project" model="nereid.url_rule">
|
||||
<field name="rule">/<language>/project/-new</field>
|
||||
<field name="endpoint">project.work.create_project</field>
|
||||
|
|
Loading…
Reference in New Issue