[fix] onshow > on_page_show

This commit is contained in:
Rushabh Mehta 2015-01-29 18:09:11 +05:30
parent 538253e503
commit 06fa46fafe
13 changed files with 19 additions and 25 deletions

View File

@ -7,7 +7,7 @@
// edit node
// see ledger
pscript['onload_Accounts Browser'] = function(wrapper){
frappe.pages["Accounts Browser"].on_page_load = function(wrapper){
frappe.ui.make_app_page({
parent: wrapper,
single_column: true
@ -58,7 +58,6 @@ pscript['onload_Accounts Browser'] = function(wrapper){
var ctype = frappe.get_route()[1] || 'Account';
erpnext.account_chart = new erpnext.AccountsChart(ctype, $(this).val(),
chart_area.get(0));
pscript.set_title(wrapper, ctype, $(this).val());
})
// load up companies
@ -74,18 +73,13 @@ pscript['onload_Accounts Browser'] = function(wrapper){
});
}
pscript.set_title = function(wrapper, ctype, val) {
}
pscript['onshow_Accounts Browser'] = function(wrapper){
frappe.pages["Accounts Browser"].on_page_show = function(wrapper){
// set route
var ctype = frappe.get_route()[1] || 'Account';
if(erpnext.account_chart && erpnext.account_chart.ctype != ctype) {
wrapper.$company_select.change();
}
pscript.set_title(wrapper, ctype);
}
erpnext.AccountsChart = Class.extend({
@ -260,7 +254,7 @@ erpnext.AccountsChart = Class.extend({
});
// show
d.onshow = function() {
d.on_page_show = function() {
$(fd.group_or_ledger.input).change();
$(fd.account_type.input).change();
}

View File

@ -3,7 +3,7 @@
frappe.require("assets/erpnext/js/account_tree_grid.js");
frappe.pages['financial-analytics'].onload = function(wrapper) {
frappe.pages['financial-analytics'].on_page_load = function(wrapper) {
frappe.ui.make_app_page({
parent: wrapper,
title: __('Financial Analytics'),

View File

@ -1,4 +1,4 @@
frappe.pages['pos'].onload = function(wrapper) {
frappe.pages['pos'].on_page_load = function(wrapper) {
var page = frappe.ui.make_app_page({
parent: wrapper,
title: __('Start POS'),

View File

@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
frappe.pages['purchase-analytics'].onload = function(wrapper) {
frappe.pages['purchase-analytics'].on_page_load = function(wrapper) {
frappe.ui.make_app_page({
parent: wrapper,
title: __('Purchase Analytics'),

View File

@ -2,9 +2,9 @@
// License: GNU General Public License v3. See license.txt
var display_activity_log = function(msg) {
if(!pscript.ss_html)
pscript.ss_html = $a(cur_frm.fields_dict['activity_log'].wrapper,'div');
pscript.ss_html.innerHTML =
if(!cur_frm.ss_html)
cur_frm.ss_html = $a(cur_frm.fields_dict['activity_log'].wrapper,'div');
cur_frm.ss_html.innerHTML =
'<div class="panel"><div class="panel-heading">'+__("Activity Log:")+'</div>'+msg+'</div>';
}

View File

@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
frappe.pages['sales-analytics'].onload = function(wrapper) {
frappe.pages['sales-analytics'].on_page_load = function(wrapper) {
frappe.ui.make_app_page({
parent: wrapper,
title: __('Sales Analytics'),

View File

@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
pscript['onload_Sales Browser'] = function(wrapper){
frappe.pages["Sales Browser"].on_page_load = function(wrapper){
var page = frappe.ui.make_app_page({
parent: wrapper,
single_column: true,
@ -32,7 +32,7 @@ pscript['onload_Sales Browser'] = function(wrapper){
wrapper.make_tree();
}
pscript['onshow_Sales Browser'] = function(wrapper){
frappe.pages['Sales Browser'].on_page_show = function(wrapper){
// set route
var ctype = frappe.get_route()[1] || 'Territory';

View File

@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
frappe.pages['sales-funnel'].onload = function(wrapper) {
frappe.pages['sales-funnel'].on_page_load = function(wrapper) {
frappe.ui.make_app_page({
parent: wrapper,
title: __('Sales Funnel'),

View File

@ -1,4 +1,4 @@
frappe.pages['setup-wizard'].onload = function(wrapper) {
frappe.pages['setup-wizard'].on_page_load = function(wrapper) {
if(sys_defaults.company) {
frappe.set_route("desktop");
return;
@ -356,7 +356,7 @@ frappe.pages['setup-wizard'].onload = function(wrapper) {
erpnext.wiz = new frappe.wiz.Wizard(wizard_settings)
}
frappe.pages['setup-wizard'].onshow = function(wrapper) {
frappe.pages['setup-wizard'].on_page_show = function(wrapper) {
if(frappe.get_route()[1])
erpnext.wiz.show(frappe.get_route()[1]);
}

View File

@ -2,7 +2,7 @@
// License: GNU General Public License v3. See license.txt
frappe.pages['stock-analytics'].onload = function(wrapper) {
frappe.pages['stock-analytics'].on_page_load = function(wrapper) {
frappe.ui.make_app_page({
parent: wrapper,
title: __('Stock Analytics'),

View File

@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
frappe.pages['stock-ledger'].onload = function(wrapper) {
frappe.pages['stock-ledger'].on_page_load = function(wrapper) {
frappe.ui.make_app_page({
parent: wrapper,
title: __('Stock Ledger'),

View File

@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
frappe.pages['stock-level'].onload = function(wrapper) {
frappe.pages['stock-level'].on_page_load = function(wrapper) {
frappe.ui.make_app_page({
parent: wrapper,
title: __('Stock Level'),

View File

@ -1,7 +1,7 @@
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
frappe.pages['support-analytics'].onload = function(wrapper) {
frappe.pages['support-analytics'].on_page_load = function(wrapper) {
frappe.ui.make_app_page({
parent: wrapper,
title: __('Support Analytics'),