Преглед на файлове

[minor] sidebar_menu renamed to sidebar_items

version-14
Rushabh Mehta преди 9 години
родител
ревизия
0d9dbac40e
променени са 3 файла, в които са добавени 15 реда и са изтрити 9 реда
  1. +12
    -6
      frappe/public/js/frappe/views/treeview.js
  2. +1
    -1
      frappe/templates/includes/web_sidebar.html
  3. +2
    -2
      frappe/website/context.py

+ 12
- 6
frappe/public/js/frappe/views/treeview.js Целия файл

@@ -24,7 +24,7 @@ frappe.views.TreeFactory = frappe.views.Factory.extend({
frappe.views.TreeView = Class.extend({ frappe.views.TreeView = Class.extend({
init: function(opts) { init: function(opts) {
var me = this; var me = this;
this.opts = {}; this.opts = {};
this.opts.get_tree_root = true; this.opts.get_tree_root = true;
$.extend(this.opts, opts); $.extend(this.opts, opts);
@@ -74,7 +74,7 @@ frappe.views.TreeView = Class.extend({
me.args[$(this).attr("data-fieldname")] = $(this).val(); me.args[$(this).attr("data-fieldname")] = $(this).val();
me.make_tree(); me.make_tree();
}) })
if (filter.default) { if (filter.default) {
$("[data-fieldname='"+filter.fieldname+"']").trigger("change"); $("[data-fieldname='"+filter.fieldname+"']").trigger("change");
} }
@@ -189,9 +189,9 @@ frappe.views.TreeView = Class.extend({
v.is_root = 0; v.is_root = 0;
v.root_type = null; v.root_type = null;
} }
$.extend(me.args, v) $.extend(me.args, v)
return frappe.call({ return frappe.call({
method: me.opts.add_tree_node || "frappe.desk.treeview.add_node", method: me.opts.add_tree_node || "frappe.desk.treeview.add_node",
args: me.args, args: me.args,
@@ -234,12 +234,18 @@ frappe.views.TreeView = Class.extend({
var me = this; var me = this;


this.menu_items = [ this.menu_items = [
{
label: __('View List'),
action: function() {
frappe.set_route('List', me.doctype);
}
},
{ {
label: __('Refresh'), label: __('Refresh'),
action: function() { action: function() {
me.make_tree(); me.make_tree();
} }
}
},
] ]


if (me.opts.menu_items) { if (me.opts.menu_items) {
@@ -261,7 +267,7 @@ frappe.views.TreeView = Class.extend({














+ 1
- 1
frappe/templates/includes/web_sidebar.html Целия файл

@@ -18,7 +18,7 @@
<li class="sidebar-item"> <li class="sidebar-item">
<a href="/me">My Account</a> <a href="/me">My Account</a>
</li> </li>
{% for item in sidebar_menu -%}
{% for item in sidebar_items -%}
<li class="sidebar-item"> <li class="sidebar-item">
<a href="{{ item.route }}" class="text-muted {{ 'active' if pathname==item.route else '' }}" <a href="{{ item.route }}" class="text-muted {{ 'active' if pathname==item.route else '' }}"
{% if item.target %}target="{{ item.target }}"{% endif %}> {% if item.target %}target="{{ item.target }}"{% endif %}>


+ 2
- 2
frappe/website/context.py Целия файл

@@ -98,8 +98,8 @@ def add_sidebar_data(context):
fields=['title', 'route', 'reference_doctype', 'show_always'], filters={'enabled': 1}, order_by='idx asc') fields=['title', 'route', 'reference_doctype', 'show_always'], filters={'enabled': 1}, order_by='idx asc')
frappe.cache().set('portal_menu_items', json.dumps(sidebar_items)) frappe.cache().set('portal_menu_items', json.dumps(sidebar_items))


if not context.sidebar_menu:
context.sidebar_menu = sidebar_items
if not context.sidebar_items:
context.sidebar_items = sidebar_items


info = get_fullname_and_avatar(frappe.session.user) info = get_fullname_and_avatar(frappe.session.user)
context["fullname"] = info.fullname context["fullname"] = info.fullname


Зареждане…
Отказ
Запис