holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix framework asks always for jdots even if the jdots is not installed

Browse Source
This commit is contained in:
Hadi Nategh 2016-05-18 12:39:06 +02:00
parent f102460ac9
commit 4aa1156af0
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/js/framework/fw_base.js
View File

@ -415,7 +415,7 @@ var fw_base = (function(){ "use strict"; return Class.extend(
{
this.serializedTabState = serialized;
egw.jsonq("api.jdots_framework.ajax_tab_changed_state.template", [data]);
egw.jsonq('EGroupware\\Api\\Framework\\Ajax::ajax_tab_changed_state', [data]);
}
},
@ -857,7 +857,7 @@ var fw_base = (function(){ "use strict"; return Class.extend(
tzSelection: function(_tz)
{
//Perform an AJAX request to tell server
var req = egw.json('api.jdots_framework.ajax_tz_selection.template',[_tz],null,null,false); // false = synchron
var req = egw.json('EGroupware\Api\Framework\Ajax::ajax_tz_selection',[_tz],null,null,false); // false = synchron
req.sendRequest();
if (this.activeApp.browser)

2
api/js/framework/fw_desktop.js
View File

@ -302,7 +302,7 @@
}
//Send the sort order to the server via ajax
var req = egw.jsonq('api.jdots_framework.ajax_appsort.template', [name_array]);
var req = egw.jsonq('EGroupware\\Api\\Framework\\Ajax::ajax_appsort', [name_array]);
},
/**

8
api/src/Framework/Ajax.php
View File

@ -423,7 +423,7 @@ abstract class Ajax extends Api\Framework
*
* @param string $tz
*/
function ajax_tz_selection($tz)
static function ajax_tz_selection($tz)
{
Api\DateTime::setUserPrefs($tz); // throws exception, if tz is invalid
@ -660,7 +660,7 @@ abstract class Ajax extends Api\Framework
* @param $tablist is an array which contains each tab as an associative array
* with the keys 'appName' and 'active'
*/
public function ajax_tab_changed_state($tablist)
public static function ajax_tab_changed_state($tablist)
{
$tabs = array();
foreach($tablist as $data)
@ -727,7 +727,7 @@ abstract class Ajax extends Api\Framework
* @param $appname the name of the application
* @param $width the width set
*/
public function ajax_sideboxwidth($appname, $width)
public static function ajax_sideboxwidth($appname, $width)
{
//error_log(__METHOD__."($appname, $width)");
//Check whether the supplied parameters are valid
@ -742,7 +742,7 @@ abstract class Ajax extends Api\Framework
*
* @param array $apps
*/
public function ajax_appsort(array $apps)
public static function ajax_appsort(array $apps)
{
$order = array();
$i = 0;