Browse Source

[fixed] module show/hide frappe/erpnext#3243

version-14
Rushabh Mehta 10 years ago
parent
commit
baf1388cd5
4 changed files with 9 additions and 4 deletions
  1. +2
    -1
      frappe/core/page/desktop/all_applications_dialog.html
  2. +1
    -1
      frappe/core/page/desktop/desktop.js
  3. +2
    -1
      frappe/core/page/desktop/desktop_icon_grid.html
  4. +4
    -1
      frappe/public/js/frappe/misc/user.js

+ 2
- 1
frappe/core/page/desktop/all_applications_dialog.html View File

@@ -5,7 +5,8 @@
{% for(var i=0, l=all_modules.length; i < l; i++) { {% for(var i=0, l=all_modules.length; i < l; i++) {
var module_name = all_modules[i]; var module_name = all_modules[i];
var module = frappe.get_module(module_name); var module = frappe.get_module(module_name);
if (desktop_items.indexOf(module_name)===-1 || module.force_show) { continue; }
if (desktop_items.indexOf(module_name)===-1
|| frappe.user.is_module_blocked(module_name)) { continue; }
%} %}
<div class="list-group-item" data-label="{%= module.label %}" data-name="{%= module.name %}"> <div class="list-group-item" data-label="{%= module.label %}" data-name="{%= module.name %}">
<div class="checkbox"> <div class="checkbox">


+ 1
- 1
frappe/core/page/desktop/desktop.js View File

@@ -49,7 +49,7 @@ $.extend(frappe.desktop, {
_id: "all_applications", _id: "all_applications",
color: "#4aa3df", color: "#4aa3df",
link: "", link: "",
//force_show: true,
force_show: true,
onclick: function() { onclick: function() {
me.all_applications.show(); me.all_applications.show();
} }


+ 2
- 1
frappe/core/page/desktop/desktop_icon_grid.html View File

@@ -2,7 +2,8 @@
<div id="icon-grid"> <div id="icon-grid">
{% for (var i=0, l=desktop_items.length; i < l; i++) { {% for (var i=0, l=desktop_items.length; i < l; i++) {
var module = frappe.get_module(desktop_items[i]); var module = frappe.get_module(desktop_items[i]);
if (!module || (user_desktop_items.indexOf(module.name)===-1 && !module.force_show)) { continue; }
if (!module || (user_desktop_items.indexOf(module.name)===-1 && !module.force_show)
|| frappe.user.is_module_blocked(module.name)) { continue; }
%} %}
{%= frappe.render_template("desktop_module_icon", module) %} {%= frappe.render_template("desktop_module_icon", module) %}
{% } %} {% } %}


+ 4
- 1
frappe/public/js/frappe/misc/user.js View File

@@ -168,7 +168,7 @@ $.extend(frappe.user, {


// filter_blocked_modules // filter_blocked_modules
user_list = $.map(user_list, function(m) { user_list = $.map(user_list, function(m) {
if(frappe.boot.user.block_modules && frappe.boot.user.block_modules.indexOf(m)!==-1) {
if(frappe.user.is_module_blocked(m)) {
return null; return null;
} else { } else {
return m; return m;
@@ -179,6 +179,9 @@ $.extend(frappe.user, {
} }
return frappe.user.modules; return frappe.user.modules;
}, },
is_module_blocked: function(m) {
return frappe.boot.user.block_modules && frappe.boot.user.block_modules.indexOf(m)!==-1;
},
is_report_manager: function() { is_report_manager: function() {
return frappe.user.has_role(['Administrator', 'System Manager', 'Report Manager']); return frappe.user.has_role(['Administrator', 'System Manager', 'Report Manager']);
}, },


Loading…
Cancel
Save