extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 12:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

use template base url from initial template, to continue using webdav, if that was loaded via webdav

Browse Source
This commit is contained in:
Ralf Becker 2014-11-05 13:07:13 +00:00
parent 123bb043d5
commit 026e93a0c4
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etemplate/js/et2_widget_template.js
View File

@ -103,7 +103,8 @@ var et2_template = et2_DOMWidget.extend(
{ {
// Ask server // Ask server
var splitted = template_name.split('.'); var splitted = template_name.split('.');
var path = this.egw().webserverUrl + "/" + splitted.shift() + "/templates/default/" + // use template base url from initial template, to continue using webdav, if that was loaded via webdav
var path = this.getRoot()._inst.template_base_url + splitted.shift() + "/templates/default/" +
splitted.join('.')+ ".xet" + (cache_buster ? '?'+cache_buster : ''); splitted.join('.')+ ".xet" + (cache_buster ? '?'+cache_buster : '');
if(splitted.length) if(splitted.length)

2
etemplate/js/etemplate2.js
View File

@ -273,6 +273,8 @@ etemplate2.prototype.download = function(_url)
etemplate2.prototype.load = function(_name, _url, _data, _callback) etemplate2.prototype.load = function(_name, _url, _data, _callback)
{ {
this.name = _name; // store top-level template name to have it available in widgets this.name = _name; // store top-level template name to have it available in widgets
// store template base url, in case initial template is loaded via webdav, to use that for further loads too
this.template_base_url = _url.split(_name.split('.').shift())[0];
egw().debug("info", "Loaded data", _data); egw().debug("info", "Loaded data", _data);
var currentapp = this.app = _data.currentapp || window.egw_appName; var currentapp = this.app = _data.currentapp || window.egw_appName;