'
- var me=this;
-
- d.onshow = function() {
- if(!me.setup_done)
- me.get_all_roles(me.profile_id);
- }
-}
-
-// make role body
-RoleObj.prototype.make_role_body = function(id){
- var me = this;
- var d = this.dialog;
- this.role_div = $a(d.widgets['roles'],'div');
-
- this.head = $a(this.role_div,'div','',{marginLeft:'4px', marginBottom:'4px',fontWeight:'bold'});
- this.body = $a(this.role_div,'div');
- this.footer = $a(this.role_div,'div');
-
- this.update_btn = $btn(this.footer,'Update',function() { me.update_roles(me.profile_id); },{marginRight:'4px'},'',1);
-}
-
-// make help body
-RoleObj.prototype.make_help_body = function(){
- var me = this;
-
- var d = this.dialog;
- this.help_div = $a(d.widgets['roles'],'div');
-
- var head = $a(this.help_div,'div'); this.help_div.head = head;
- var body = $a(this.help_div,'div'); this.help_div.body = body;
- var tail = $a(this.help_div,'div'); this.help_div.tail = tail;
-
- var back_btn = $btn(tail,'Back', function() {
- // back to assign roles
- $(me.role_div).slideToggle('medium');
- $(me.help_div).slideToggle('medium');
- });
- this.help_div.back_btn = back_btn;
- $dh(this.help_div);
-}
-
-// get all roles
-RoleObj.prototype.get_all_roles = function(id){
- if(pscript.all_roles) {
- this.make_roles(id);
- return;
- }
-
- var me = this;
- var callback = function(r,rt){
- pscript.all_roles = r.message;
- me.make_roles(id);
- }
- $c_obj('Company Control','get_all_roles','',callback);
-}
-
-// make roles
-RoleObj.prototype.make_roles = function(id){
- var me = this;
- var list = pscript.all_roles;
- me.setup_done = 1;
- me.body.innerHTML = '';
-
- var tbl = make_table( me.body, cint(list.length / 2) + 1,4,'100%',['5%','45%','5%','45%'],{padding:'4px'});
- var in_right = 0; var ridx = 0;
-
- for(i=0;i'; - - perm_tbl = make_table(me.help_div.body,cint(perm.length)+2,7,'100%',['30%','10%','10%','10%','10%','10%','10%'],{padding:'4px'}); - - var head_lst = ['Document','Read','Write','Create','Submit','Cancel','Amend']; - - for(var i=0; i<(head_lst.length-1);i++){ - $td(perm_tbl,0,i).innerHTML= ""+head_lst[i]+""; - } - var accept_img1 = 'lib/images/icons/accept.gif'; - var cancel_img1 = 'lib/images/icons/cancel.gif'; - - for(i=1; i
'; -} diff --git a/erpnext/setup/page/modules_setup/__init__.py b/erpnext/setup/page/modules_setup/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/setup/page/modules_setup/modules_setup.css b/erpnext/setup/page/modules_setup/modules_setup.css new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/setup/page/modules_setup/modules_setup.html b/erpnext/setup/page/modules_setup/modules_setup.html new file mode 100644 index 0000000000..ea136ffcae --- /dev/null +++ b/erpnext/setup/page/modules_setup/modules_setup.html @@ -0,0 +1,14 @@ +
+ ×
+
+
\ No newline at end of file
diff --git a/erpnext/setup/page/modules_setup/modules_setup.js b/erpnext/setup/page/modules_setup/modules_setup.js
new file mode 100644
index 0000000000..fe7f14fad3
--- /dev/null
+++ b/erpnext/setup/page/modules_setup/modules_setup.js
@@ -0,0 +1,50 @@
+wn.require('lib/js/lib/jquery-ui-sortable.min.js');
+
+$.extend(wn.pages.modules_setup, {
+ modules: ['Accounts', 'Selling', 'Buying', 'Stock', 'Production', 'Projects',
+ 'Support', 'HR', 'Website'],
+ onload: function(wrapper) {
+ wn.pages.modules_setup.refresh(wn.boot.modules_list);
+ },
+ refresh: function(ml) {
+ $('#modules-list').empty();
+
+ // checked modules
+ for(i in ml) {
+ $('#modules-list').append(repl('Modules Setup
++
+ Select checkbox to show / hide module. Drag around to move order.
+
+
+
+
+
+
+\ + \ + %(m)s
', {m:ml[i]})); + } + $('#modules-list [data-module]').attr('checked', true); + + // unchecked modules + var all = wn.pages.modules_setup.modules; + for(i in all) { + if(!$('#modules-list [data-module="'+all[i]+'"]').length) { + $('#modules-list').append(repl('\ + \ + %(m)s
', {m:all[i]})); + } + } + + $('#modules-list').sortable(); + + }, + update: function() { + var ml = []; + $('#modules-list [data-module]').each(function() { + if($(this).attr('checked')) + ml.push($(this).attr('data-module')); + }); + + wn.call({ + method: 'setup.page.modules_setup.modules_setup.update', + args: { + ml: JSON.stringify(ml) + }, + callback: function(r) { + }, + btn: $('#modules-update').get(0) + }); + } +}); \ No newline at end of file diff --git a/erpnext/setup/page/modules_setup/modules_setup.py b/erpnext/setup/page/modules_setup/modules_setup.py new file mode 100644 index 0000000000..ee36dfaeaa --- /dev/null +++ b/erpnext/setup/page/modules_setup/modules_setup.py @@ -0,0 +1,8 @@ +import webnotes + +@webnotes.whitelist() +def update(arg=None): + """update modules""" + webnotes.conn.set_global('modules_list', webnotes.form_dict['ml']) + webnotes.msgprint('Updated') + webnotes.clear_cache() \ No newline at end of file diff --git a/erpnext/setup/page/modules_setup/modules_setup.txt b/erpnext/setup/page/modules_setup/modules_setup.txt new file mode 100644 index 0000000000..70c6a90cc2 --- /dev/null +++ b/erpnext/setup/page/modules_setup/modules_setup.txt @@ -0,0 +1,28 @@ +# Page, modules_setup +[ + + # These values are common in all dictionaries + { + 'creation': '2012-02-28 17:48:39', + 'docstatus': 0, + 'modified': '2012-02-28 17:48:39', + 'modified_by': u'Administrator', + 'owner': u'Administrator' + }, + + # These values are common for all Page + { + 'doctype': 'Page', + 'module': u'Setup', + 'name': '__common__', + 'page_name': u'modules_setup', + 'standard': u'Yes', + 'title': u'Modules Setup' + }, + + # Page, modules_setup + { + 'doctype': 'Page', + 'name': u'modules_setup' + } +] \ No newline at end of file diff --git a/erpnext/setup/page/setup/setup.html b/erpnext/setup/page/setup/setup.html index 7963cb9d9a..50ef112bbb 100644 --- a/erpnext/setup/page/setup/setup.html +++ b/erpnext/setup/page/setup/setup.html @@ -20,7 +20,7 @@Users and Permissions
- Users
+ Users
Add/remove users, set roles, passwords etc
@@ -31,6 +31,10 @@
Amount based Authorization Rules
Restrict submission rights based on amount
+ Modules Setup
+ Show, hide modules
+
Data
diff --git a/erpnext/startup/event_handlers.py b/erpnext/startup/event_handlers.py index 5f0cc2334c..a1d805ef1f 100644 --- a/erpnext/startup/event_handlers.py +++ b/erpnext/startup/event_handlers.py @@ -87,6 +87,8 @@ def boot_session(bootinfo): import webnotes.model.doctype bootinfo['docs'] += webnotes.model.doctype.get('Event') + + bootinfo['modules_list'] = webnotes.conn.get_global('modules_list') def get_letter_heads(): """load letter heads with startup""" diff --git a/erpnext/startup/toolbar.js b/erpnext/startup/toolbar.js index 7eda49361c..8c8d04167e 100644 --- a/erpnext/startup/toolbar.js +++ b/erpnext/startup/toolbar.js @@ -73,20 +73,35 @@ erpnext.toolbar.add_modules = function() { $('
+ ×
+
+
\ No newline at end of file
diff --git a/erpnext/utilities/page/users/users.js b/erpnext/utilities/page/users/users.js
new file mode 100644
index 0000000000..21519b85a1
--- /dev/null
+++ b/erpnext/utilities/page/users/users.js
@@ -0,0 +1,377 @@
+// ERPNext - web based ERP (http://erpnext.com)
+// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see Users
++
Add, disable, delete users and change their roles, passwords and security settings
+
+
+
+
+
+
+\
+ %(delete_html)s\
+ s)
\
+ \
+
', data));
+
+ if(!data.enabled) {
+ $('.users-area .user-card:last')
+ .addClass('disabled')
+ .find('.user-fullname').html('Disabled');
+ }
+ },
+ show_settings: function(uid) {
+ var me = wn.pages.users;
+ if(!me.settings_dialog)
+ me.make_settings_dialog();
+
+ var p = me.profiles[uid];
+ me.uid = uid;
+
+ me.settings_dialog.set_values({
+ restrict_ip: p.restrict_ip || '',
+ login_before: p.login_before || '',
+ login_after: p.login_after || '',
+ enabled: p.enabled || 0,
+ new_password: ''
+ });
+
+ me.settings_dialog.show();
+
+ },
+ make_settings_dialog: function() {
+ var me = wn.pages.users;
+ me.settings_dialog = new wn.widgets.Dialog({
+ title: 'Set User Security',
+ width: 500,
+ fields: [
+ {
+ label:'Enabled',
+ description: 'Uncheck to disable',
+ fieldtype: 'Check', fieldname: 'enabled'
+ },
+ {
+ label:'IP Address',
+ description: 'Restrict user login by IP address, partial ips (111.111.111), \
+ multiple addresses (separated by commas) allowed',
+ fieldname:'restrict_ip', fieldtype:'Data'
+ },
+ {
+ label:'Login After',
+ description: 'User can only login after this hour (0-24)',
+ fieldtype: 'Int', fieldname: 'login_after'
+ },
+ {
+ label:'Login Before',
+ description: 'User can only login before this hour (0-24)',
+ fieldtype: 'Int', fieldname: 'login_before'
+ },
+ {
+ label:'New Password',
+ description: 'Update the current user password',
+ fieldtype: 'Data', fieldname: 'new_password'
+ },
+ {
+ label:'Update', fieldtype:'Button', fieldname:'update'
+ }
+ ]
+ });
+
+ this.settings_dialog.fields_dict.update.input.onclick = function() {
+ var btn = this;
+ this.set_working();
+ var args = me.settings_dialog.get_values();
+ args.user = me.uid;
+
+ if (args.new_password) {
+ me.get_password(btn, args);
+ } else {
+ btn.set_working();
+ me.update_security(args);
+ }
+ };
+
+ },
+ update_security: function(args) {
+ var me = wn.pages.users;
+ $c_page('utilities', 'users', 'update_security', JSON.stringify(args), function(r,rt) {
+ if(r.exc) {
+ msgprint(r.exc);
+ return;
+ }
+ me.settings_dialog.hide();
+ $.extend(me.profiles[me.uid], me.settings_dialog.get_values());
+ me.refresh();
+ });
+ },
+ get_password: function(btn, args) {
+ var me = wn.pages.users;
+ var pass_d = new wn.widgets.Dialog({
+ title: 'Your Password',
+ width: 300,
+ fields: [
+ {
+ label: 'Please Enter Your Password',
+ description: "Your password is required to update the user's password",
+ fieldtype: 'Password', fieldname: 'sys_admin_pwd', reqd: 1
+ },
+ {
+ label: 'Continue', fieldtype: 'Button', fieldname: 'continue'
+ }
+ ]
+ });
+
+ pass_d.fields_dict.continue.input.onclick = function() {
+ btn.pwd_dialog.hide();
+ args.sys_admin_pwd = btn.pwd_dialog.get_values().sys_admin_pwd;
+ btn.set_working();
+ me.update_security(args);
+ btn.done_working();
+ }
+
+ pass_d.show();
+ btn.pwd_dialog = pass_d;
+ btn.done_working();
+ },
+ add_user: function() {
+ var me = wn.pages.users;
+ var d = new wn.widgets.Dialog({
+ title: 'Add User',
+ width: 400,
+ fields: [{
+ fieldtype: 'Data', fieldname: 'user', reqd: 1,
+ label: 'Email Id of the user to add'
+ }, {
+ fieldtype: 'Data', fieldname: 'first_name', reqd: 1, label: 'First Name'
+ }, {
+ fieldtype: 'Data', fieldname: 'last_name', label: 'Last Name'
+ }, {
+ fieldtype: 'Data', fieldname: 'password', reqd: 1, label: 'Password'
+ }, {
+ fieldtype: 'Button', label: 'Add', fieldname: 'add'
+ }]
+ });
+
+ d.make();
+ d.fields_dict.add.input.onclick = function() {
+ v = d.get_values();
+ if(v) {
+ d.fields_dict.add.input.set_working();
+ $c_page('utilities', 'users', 'add_user', v, function(r,rt) {
+ if(r.exc) { msgprint(r.exc); return; }
+ else {
+ d.hide();
+ me.refresh();
+ }
+ })
+ }
+ }
+ d.show();
+ }
+});
+
+erpnext.RoleEditor = Class.extend({
+ init: function() {
+ this.dialog = new wn.widgets.Dialog({
+ title: 'Set Roles'
+ });
+ var me = this;
+ $(this.dialog.body).html('Loading...
')
+ wn.call({
+ method:'utilities.page.users.users.get_roles',
+ callback: function(r) {
+ me.roles = r.message;
+ me.show_roles();
+ }
+ });
+ },
+ show_roles: function() {
+ var me = this;
+ $(this.dialog.body).empty();
+ for(var i in this.roles) {
+ $(this.dialog.body).append(repl('', {role: this.roles[i]}));
+ }
+ $(this.dialog.body).append('\
+
');
+ $(this.dialog.body).find('button.btn-primary').click(function() {
+ me.save();
+ });
+ $(this.dialog.body).find('.user-role a').click(function() {
+ me.show_permissions($(this).parent().attr('data-user-role'))
+ return false;
+ })
+ },
+ show: function(uid) {
+ var me = this;
+ this.uid = uid;
+ this.dialog.show();
+ // set user roles
+ wn.call({
+ method:'utilities.page.users.users.get_user_roles',
+ args: {uid:uid},
+ callback: function(r, rt) {
+ $(me.dialog.body).find('input[type="checkbox"]').attr('checked', false);
+ for(var i in r.message) {
+ $(me.dialog.body)
+ .find('[data-user-role="'+r.message[i]
+ +'"] input[type="checkbox"]').attr('checked',true);
+ }
+ }
+ })
+ },
+ save: function() {
+ var set_roles = [];
+ var unset_roles = [];
+ $(this.dialog.body).find('[data-user-role]').each(function() {
+ var $check = $(this).find('input[type="checkbox"]');
+ if($check.attr('checked')) {
+ set_roles.push($(this).attr('data-user-role'));
+ } else {
+ unset_roles.push($(this).attr('data-user-role'));
+ }
+ })
+ wn.call({
+ method:'utilities.page.users.users.update_roles',
+ args: {
+ set_roles: JSON.stringify(set_roles),
+ unset_roles: JSON.stringify(unset_roles),
+ uid: this.uid
+ },
+ btn: $(this.dialog.body).find('.btn-primary').get(0),
+ callback: function() {
+
+ }
+ })
+ },
+ show_permissions: function(role) {
+ // show permissions for a role
+ var me = this;
+ if(!this.perm_dialog)
+ this.make_perm_dialog()
+ $(this.perm_dialog.body).empty();
+ wn.call({
+ method:'utilities.page.users.users.get_perm_info',
+ args: {role: role},
+ callback: function(r) {
+ var $body = $(me.perm_dialog.body);
+ $body.append('| Document Type | \ +Level | \ +Read | \ +Write | \ +Submit | \ +Cancel | \ +Amend |
|---|