vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

bug fix for permission manager, missed filedname which lead translated get_input failed.

Browse source 
in addition to that, vaiours __() added.
This commit is contained in:
81552433qqcom 2014-09-15 14:54:47 +08:00
parent 4ae9424e50
commit f7bf7224e4
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
frappe/core/doctype/user/user.js
View file

@ -47,7 +47,7 @@ cur_frm.cscript.refresh = function(doc) {
cur_frm.toggle_display(['sb1', 'sb3'], false);
if(!doc.__islocal){
cur_frm.add_custom_button("Set User Permissions", function() {
cur_frm.add_custom_button(__("Set User Permissions"), function() {
frappe.route_options = {
"user": doc.name
};
@ -95,7 +95,7 @@ frappe.RoleEditor = Class.extend({
init: function(wrapper) {
var me = this;
this.wrapper = wrapper;
$(wrapper).html('<div class="help">Loading...</div>')
$(wrapper).html('<div class="help">' + __("Loading") + '...</div>')
return frappe.call({
method: 'frappe.core.doctype.user.user.get_all_roles',
callback: function(r) {
@ -138,10 +138,10 @@ frappe.RoleEditor = Class.extend({
$.each(this.roles, function(i, role) {
$(me.wrapper).append(repl('<div class="user-role" \
data-user-role="%(role)s">\
data-user-role="%(role_value)s">\
<input type="checkbox" style="margin-top:0px;"> \
<a href="#">%(role)s</a>\
</div>', {role: role}));
<a href="#">%(role_display)s</a>\
</div>', {role_value: role,role_display:__(role)}));
});
$(this.wrapper).find('input[type="checkbox"]').change(function() {
@ -282,7 +282,7 @@ frappe.RoleEditor = Class.extend({
},
make_perm_dialog: function() {
this.perm_dialog = new frappe.ui.Dialog({
title:'Role Permissions'
title:__('Role Permissions')
});
this.perm_dialog.$wrapper.find('.modal-dialog').css("width", "800px");

6
frappe/core/page/permission_manager/permission_manager.js
View file

@ -286,7 +286,7 @@ frappe.PermissionEngine = Class.extend({
r.message = $.map(r.message, function(p) {
return $.format('<a href="#Form/User/{0}">{1}</a>', [p, p]);
})
msgprint(__("Users with role {0}:", [role])
msgprint(__("Users with role {0}:", [__(role)])
+ "<br>" + r.message.join("<br>"));
}
})
@ -362,11 +362,11 @@ frappe.PermissionEngine = Class.extend({
{fieldtype:"Select", label:__("Document Type"),
options:me.options.doctypes, reqd:1, fieldname:"parent"},
{fieldtype:"Select", label:__("Role"),
options:me.options.roles, reqd:1},
options:me.options.roles, reqd:1,fieldname:"role"},
{fieldtype:"Select", label:__("Permission Level"),
options:[0,1,2,3,4,5,6,7,8,9], reqd:1, fieldname: "permlevel",
description: __("Level 0 is for document level permissions, higher levels for field level permissions.")},
{fieldtype:"Button", label:__("Add")},
{fieldtype:"Button", label:__("Add"),fieldname:"add"},
]
});
if(me.get_doctype()) {

18
frappe/core/page/user_permissions/user_permissions.js
View file

@ -1,7 +1,7 @@
frappe.pages['user-permissions'].onload = function(wrapper) {
frappe.ui.make_app_page({
parent: wrapper,
title: "User Permissions Manager",
title: __("User Permissions Manager"),
icon: "icon-shield",
single_column: true
});
@ -68,14 +68,14 @@ frappe.UserPermissions = Class.extend({
fieldname: "user",
label: __("User"),
fieldtype: "Select",
options: (["Select User..."].concat(r.message.users)).join("\n")
options: ([__("Select User") + "..."].concat(r.message.users)).join("\n")
});
me.filters.doctype = me.wrapper.appframe.add_field({
fieldname: "doctype",
label: __("DocType"),
fieldtype: "Select",
options: (["Select DocType..."].concat(me.get_link_names())).join("\n")
options: ([__("Select DocType") + "..."].concat(me.get_link_names())).join("\n")
});
me.filters.user_permission = me.wrapper.appframe.add_field({
@ -127,7 +127,7 @@ frappe.UserPermissions = Class.extend({
me.upload.$input.on("click", function() {
var d = new frappe.ui.Dialog({
title: "Upload User Permissions",
title: __("Upload User Permissions"),
fields: [
{
fieldtype:"HTML",
@ -149,7 +149,7 @@ frappe.UserPermissions = Class.extend({
},
callback: function(r) {
if(!r.exc) {
msgprint("Permissions Updated");
msgprint(__("Permissions Updated"));
d.hide();
}
}
@ -178,11 +178,11 @@ frappe.UserPermissions = Class.extend({
},
get_user: function() {
var user = this.filters.user.$input.val();
return user=="Select User..." ? null : user;
return user== __("Select User") + "..." ? null : user;
},
get_doctype: function() {
var doctype = this.filters.doctype.$input.val();
return doctype=="Select DocType..." ? null : doctype;
return doctype== __("Select DocType") + "..." ? null : doctype;
},
get_user_permission: function() {
// autosuggest hack!
@ -289,7 +289,7 @@ frappe.UserPermissions = Class.extend({
.appendTo($("<p>").appendTo(this.body))
.click(function() {
var d = new frappe.ui.Dialog({
title: "Add New User Permission",
title: __("Add New User Permission"),
fields: [
{fieldtype:"Select", label:__("User"),
options:me.options.users, reqd:1, fieldname:"user"},
@ -331,7 +331,7 @@ frappe.UserPermissions = Class.extend({
args: args,
callback: function(r) {
if(r.exc) {
msgprint("Did not add");
msgprint(__("Did not add"));
} else {
me.refresh();
}