Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: read-only form for multiple role access in the same workflow state #21008

Merged
merged 8 commits into from
May 16, 2023
Merged

fix: read-only form for multiple role access in the same workflow state #21008

Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6633420
fix: read only form for same workflow state have multiple role access
bhavesh95863 May 15, 2023
8881db0
Update frappe/public/js/frappe/model/workflow.js
bhavesh95863 May 16, 2023
7baebf2
Update frappe/public/js/frappe/model/workflow.js
bhavesh95863 May 16, 2023
1b4ac85
chore: linter fix
shariquerik May 16, 2023
157ea02
Merge branch 'develop' into workflow
shariquerik May 16, 2023
5185e7d
chore: changes function name
shariquerik May 16, 2023
cf3420d
chore: removed redundant code
shariquerik May 16, 2023
d8a35a5
Merge branch 'develop' into workflow
shariquerik May 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 13 additions & 11 deletions frappe/public/js/frappe/model/workflow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,14 @@ frappe.workflow = {
frappe.workflow.setup(doc.doctype);
return frappe.xcall("frappe.model.workflow.get_transitions", { doc: doc });
},
get_document_state: function (doctype, state) {
get_document_state_roles: function (doctype, state) {
frappe.workflow.setup(doctype);
return frappe.get_children(frappe.workflow.workflows[doctype], "states", {
state: state,
})[0];
let workflow_states = frappe.get_children(frappe.workflow.workflows[doctype], "states", { state: state }) || [];
let workflow_states =
frappe.get_children(frappe.workflow.workflows[doctype], "states", { state: state }) ||
[];
let allow_edit_list = workflow_states.map((d) => d.allow_edit);
return allow_edit_list;
},
is_self_approval_enabled: function (doctype) {
return frappe.workflow.workflows[doctype].allow_self_approval;
Expand All @@ -55,14 +58,13 @@ frappe.workflow = {
var state =
doc[state_fieldname] || frappe.workflow.get_default_state(doctype, doc.docstatus);

var allow_edit = state
? frappe.workflow.get_document_state(doctype, state) &&
frappe.workflow.get_document_state(doctype, state).allow_edit
let allow_edit_roles = state
? frappe.workflow.get_document_state_roles(doctype, state)
: null;

if (!frappe.user_roles.includes(allow_edit)) {
return true;
}
let has_common_role = frappe.user_roles.some((role) =>
allow_edit_roles.includes(role)
);
return !has_common_role;
}
return false;
},
Expand Down