From a4f454faa04927f7d1e9b5ec4af6337aa2cbfc9a Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 29 Feb 2012 19:19:01 +0530 Subject: [PATCH] module page link fix --- erpnext/startup/js/modules.js | 5 ++++- erpnext/stock/page/stock_home/stock_home.html | 2 +- erpnext/website/page/website_home/website_home.html | 2 +- js/all-app.js | 4 ++-- js/all-web.js | 2 +- version.num | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/erpnext/startup/js/modules.js b/erpnext/startup/js/modules.js index dbd11b0b39..add068c75f 100644 --- a/erpnext/startup/js/modules.js +++ b/erpnext/startup/js/modules.js @@ -73,7 +73,10 @@ erpnext.module_page.make_list = function(module, wrapper) { args: { module: module }, - no_refresh: true + no_refresh: true, + callback: function(r) { + erpnext.module_page.hide_links(wrapper) + } }); wrapper.list.run(); } \ No newline at end of file diff --git a/erpnext/stock/page/stock_home/stock_home.html b/erpnext/stock/page/stock_home/stock_home.html index 9ba21a43dd..bab93dcfbd 100644 --- a/erpnext/stock/page/stock_home/stock_home.html +++ b/erpnext/stock/page/stock_home/stock_home.html @@ -4,7 +4,7 @@

Stock


-

Stock Entry

+

Stock Entry

Transfer stock from one warehouse to another

Delivery Note

Delivery (shipment) to customers

diff --git a/erpnext/website/page/website_home/website_home.html b/erpnext/website/page/website_home/website_home.html index 747ca5aa03..4c3c9c6c7b 100644 --- a/erpnext/website/page/website_home/website_home.html +++ b/erpnext/website/page/website_home/website_home.html @@ -4,7 +4,7 @@

Support


-

Web Page

+

Web Page

Static (content) web page

Product

Product listed in catolog

diff --git a/js/all-app.js b/js/all-app.js index fafaec294b..be01071a0b 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -901,7 +901,7 @@ this.clear=function(){this.results_area.innerHTML='';this.table=null;$ds(this.re this.make_results=function(r,rt){if(this.start==0)this.clear();$dh(this.more_button_area);if(this.loading_img)$dh(this.loading_img) if(r.message)r.values=r.message;if(r.values&&r.values.length){this.values=r.values;var m=Math.min(r.values.length,this.page_length);for(var i=0;i=this.page_length)$ds(this.more_button_area);}else{if(this.start==0){$dh(this.results_area);$ds(this.no_results_area);}} -if(this.onrun)this.onrun();if(this.opts.onrun)this.opts.onrun();} +if(this.onrun)this.onrun();if(this.opts.onrun)this.opts.onrun();if(this.opts.callback)this.opts.callback(r);} this.add_row=function(){return $a(this.results_area,'div','',(opts.cell_style?opts.cell_style:{padding:'3px 0px'}));} this.run=function(callback,append){if(callback) this.onrun=callback;if(!append) @@ -2255,7 +2255,7 @@ wn.provide('erpnext.module_page');erpnext.module_page.setup_page=function(module erpnext.module_page.hide_links=function(wrapper){$(wrapper).find('[href*="List/"]').each(function(){var href=$(this).attr('href');var dt=href.split('/')[1];if(wn.boot.profile.can_read.indexOf(get_label_doctype(dt))==-1){var txt=$(this).text();$(this).parent().css('color','#999').html(txt);}});$(wrapper).find('[data-doctype]').each(function(){var dt=$(this).attr('data-doctype');if(wn.boot.profile.can_read.indexOf(dt)==-1){var txt=$(this).text();$(this).parent().css('color','#999').html(txt);}});$(wrapper).find('[href*="Form/"]').each(function(){var href=$(this).attr('href');var dt=href.split('/')[1];if(wn.boot.profile.can_read.indexOf(get_label_doctype(dt))==-1){var txt=$(this).text();$(this).parent().css('color','#999').html(txt);}});} erpnext.module_page.make_list=function(module,wrapper){wrapper.list=new wn.widgets.Listing({parent:$(wrapper).find('.reports-list').get(0),method:'utilities.get_report_list',render_row:function(row,data){if(!data.parent_doc_type)data.parent_doc_type=data.doc_type;$(row).html(repl('\ - %(criteria_name)s',data))},args:{module:module},no_refresh:true});wrapper.list.run();} + %(criteria_name)s',data))},args:{module:module},no_refresh:true,callback:function(r){erpnext.module_page.hide_links(wrapper)}});wrapper.list.run();} /* * erpnext/startup/js/toolbar.js */ diff --git a/js/all-web.js b/js/all-web.js index 5137d58b60..cad3c77fd3 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -716,7 +716,7 @@ this.clear=function(){this.results_area.innerHTML='';this.table=null;$ds(this.re this.make_results=function(r,rt){if(this.start==0)this.clear();$dh(this.more_button_area);if(this.loading_img)$dh(this.loading_img) if(r.message)r.values=r.message;if(r.values&&r.values.length){this.values=r.values;var m=Math.min(r.values.length,this.page_length);for(var i=0;i=this.page_length)$ds(this.more_button_area);}else{if(this.start==0){$dh(this.results_area);$ds(this.no_results_area);}} -if(this.onrun)this.onrun();if(this.opts.onrun)this.opts.onrun();} +if(this.onrun)this.onrun();if(this.opts.onrun)this.opts.onrun();if(this.opts.callback)this.opts.callback(r);} this.add_row=function(){return $a(this.results_area,'div','',(opts.cell_style?opts.cell_style:{padding:'3px 0px'}));} this.run=function(callback,append){if(callback) this.onrun=callback;if(!append) diff --git a/version.num b/version.num index eb6fa5affc..fc0b67d079 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -773 \ No newline at end of file +774 \ No newline at end of file