nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 15:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Project fixes (#18343)

Browse Source 
* fix: Add fetch from in Full Name

* fix: Remove deprecated buttons

* fix: Show Project to Administrator
This commit is contained in:
Faris Ansari
2019-07-16 09:40:09 +05:30
committed by Nabin Hait
parent ce3594796c
commit 82770d9152
3 changed files with 78 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/templates/pages/projects.py
View File

@@ -7,22 +7,22 @@ import json
def get_context(context):
project_user = frappe.db.get_value("Project User", {"parent": frappe.form_dict.project, "user": frappe.session.user} , ["user", "view_attachments"], as_dict= True)
if not project_user or frappe.session.user == 'Guest':
if frappe.session.user != 'Administrator' and (not project_user or frappe.session.user == 'Guest'):
raise frappe.PermissionError
context.no_cache = 1
context.show_sidebar = True
project = frappe.get_doc('Project', frappe.form_dict.project)
project.has_permission('read')
project.tasks = get_tasks(project.name, start=0, item_status='open',
search=frappe.form_dict.get("search"))
project.timesheets = get_timesheets(project.name, start=0,
search=frappe.form_dict.get("search"))
if project_user.view_attachments:
if project_user and project_user.view_attachments:
project.attachments = get_attachments(project.name)
context.doc = project
@@ -46,7 +46,7 @@ def get_tasks(project, start=0, search=None, item_status=None):
task.todo=task.todo[0]
task.todo.user_image = frappe.db.get_value('User', task.todo.owner, 'user_image')
task.comment_count = len(json.loads(task._comments or "[]"))
task.css_seen = ''
@@ -86,7 +86,7 @@ def get_timesheets(project, start=0, search=None):
timesheet.info.css_seen = ''
if timesheet.info._seen:
if frappe.session.user in json.loads(timesheet.info._seen):
timesheet.info.css_seen = 'seen'
timesheet.info.css_seen = 'seen'
return timesheets
@frappe.whitelist()