app_base.js

hnategh-2 2016-02-22 13:03:58 UTC #1

Author: hnategh
New Revision: 55093

URL: http://svn.stylite.de/viewvc/egroupware?rev=55093&view=rev
Log:
Mobile theme W.I.P.:

Fix error 500 happens when opening view template
Implement better approach for specifying currentapp

Modified:
trunk/etemplate/js/etemplate2.js
trunk/phpgwapi/js/jsapi/app_base.js

Modified: trunk/etemplate/js/etemplate2.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/js/etemplate2.js?rev=55093&r1=55092&r2=55093&view=diff

— trunk/etemplate/js/etemplate2.js (original)
+++ trunk/etemplate/js/etemplate2.js Mon Feb 22 14:03:57 2016
@@ -350,7 +350,7 @@
this.template_base_url += _url.split(_name.split(’.’).shift())[0];

egw().debug("info", "Loaded data", _data);

var currentapp = this.app = _data.currentapp || window.egw_appName;

var currentapp = this.app = _data.currentapp || egw().app_name();

// extract $content[‘msg’] and call egw.message() with it
var msg = _data.content.msg;

Modified: trunk/phpgwapi/js/jsapi/app_base.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/js/jsapi/app_base.js?rev=55093&r1=55092&r2=55093&view=diff

— trunk/phpgwapi/js/jsapi/app_base.js (original)
+++ trunk/phpgwapi/js/jsapi/app_base.js Mon Feb 22 14:03:57 2016
@@ -455,7 +455,7 @@
var templateName = _action.data.mobileViewTemplate || ‘edit.xet’;
var etemplate = new etemplate2 (this.viewTemplate[0], false);
var template = egw.webserverUrl+ ‘/’ + this.appname + ‘/templates/mobile/’+templateName+’?1’;

  var data = {content:content, readonlys:{'__ALL__':true,'link_to':false}};

  var data = {content:content, readonlys:{'__ALL__':true,'link_to':false}, currentapp:id_app[0]};
  
  if(template.indexOf('.xet') > 0)
  {

Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs