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

[minor] Handle empty section name #4676

Merged
merged 1 commit into from
Dec 25, 2017
Merged

[minor] Handle empty section name #4676

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 18 additions & 17 deletions frappe/desk/page/modules/modules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ frappe.pages['modules'].on_page_load = function(wrapper) {
page.get_page_modules = () => {
return frappe.get_desktop_icons(true)
.filter(d => d.type==='module' && !d.blocked)
.sort((a, b) => { return (a._label > b._label) ? 1 : -1 });
}
.sort((a, b) => { return (a._label > b._label) ? 1 : -1; });
};

let get_module_sidebar_item = (item) => `<li class="strong module-sidebar-item">
<a class="module-link" data-name="${item.module_name}" href="#modules/${item.module_name}">
Expand All @@ -47,19 +47,19 @@ frappe.pages['modules'].on_page_load = function(wrapper) {
${sidebar_items_html}
<li class="divider"></li>
</ul>`;
}
};

// render sidebar
page.sidebar.html(get_sidebar_html());

// help click
page.main.on("click", '.module-section-link[data-type="help"]', function(event) {
page.main.on("click", '.module-section-link[data-type="help"]', function() {
frappe.help.show_video($(this).attr("data-youtube-id"));
return false;
});

// notifications click
page.main.on("click", '.open-notification', function(event) {
page.main.on("click", '.open-notification', function() {
var doctype = $(this).attr('data-doctype');
if(doctype) {
frappe.ui.notifications.show_open_count_list(doctype);
Expand All @@ -71,9 +71,10 @@ frappe.pages['modules'].on_page_load = function(wrapper) {
page.wrapper.find('.module-sidebar-item.active, .module-link.active').removeClass('active');
$(link).addClass('active').parent().addClass("active");
show_section($(link).attr('data-name'));
}
};

var show_section = function(module_name) {
if (!module_name) return;
if(module_name in page.section_data) {
render_section(page.section_data[module_name]);
} else {
Expand All @@ -94,7 +95,7 @@ frappe.pages['modules'].on_page_load = function(wrapper) {
});
}

}
};

var render_section = function(m) {
page.set_title(__(m.label));
Expand All @@ -109,7 +110,7 @@ frappe.pages['modules'].on_page_load = function(wrapper) {

//setup_section_toggle();
frappe.app.update_notification_count_in_modules();
}
};

var process_data = function(module_name, data) {
frappe.module_links[module_name] = [];
Expand All @@ -124,7 +125,7 @@ frappe.pages['modules'].on_page_load = function(wrapper) {
}
if(!item.route) {
if(item.link) {
item.route=strip(item.link, "#")
item.route=strip(item.link, "#");
}
else if(item.type==="doctype") {
if(frappe.model.is_single(item.doctype)) {
Expand All @@ -133,16 +134,16 @@ frappe.pages['modules'].on_page_load = function(wrapper) {
if (item.filters) {
frappe.route_options=item.filters;
}
item.route="List/" + item.doctype
item.route="List/" + item.doctype;
//item.style = 'font-weight: 500;';
}
// item.style = 'font-weight: bold;';
}
else if(item.type==="report" && item.is_query_report) {
item.route="query-report/" + item.name
item.route="query-report/" + item.name;
}
else if(item.type==="report") {
item.route="Report/" + item.doctype + "/" + item.name
item.route="Report/" + item.doctype + "/" + item.name;
}
else if(item.type==="page") {
item.route=item.name;
Expand All @@ -151,7 +152,7 @@ frappe.pages['modules'].on_page_load = function(wrapper) {

if(item.route_options) {
item.route += "?" + $.map(item.route_options, function(value, key) {
return encodeURIComponent(key) + "=" + encodeURIComponent(value) }).join('&')
return encodeURIComponent(key) + "=" + encodeURIComponent(value); }).join('&');
}

if(item.type==="page" || item.type==="help" || item.type==="report" ||
Expand All @@ -160,8 +161,8 @@ frappe.pages['modules'].on_page_load = function(wrapper) {
}
});
});
}
}
};
};

frappe.pages['modules'].on_page_show = function(wrapper) {
let route = frappe.get_route();
Expand All @@ -178,10 +179,10 @@ frappe.pages['modules'].on_page_show = function(wrapper) {
}
} else if(frappe.modules_page.last_link) {
// open last link
frappe.set_route('modules', frappe.modules_page.last_link.attr('data-name'))
frappe.set_route('modules', frappe.modules_page.last_link.attr('data-name'));
} else {
// first time, open the first page
frappe.modules_page.activate_link(frappe.modules_page.sidebar.find('.module-link:first'));
}
}
};