diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-10-28 21:52:18 +0400 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-10-29 18:04:55 +0400 |
| commit | 1bdd0c949bca2f68da0ab3f47efbec10a7e51702 (patch) | |
| tree | 62fbadd89e54810cc4c60ba6887cb0bc3e8d28f5 | |
| parent | ab4ade0d24e9bba51bbdaac9a5fe06a3eff63355 (diff) | |
Move and fix app setting navigation detect
| -rw-r--r-- | settings/ajax/navigationdetect.php (renamed from core/ajax/navigationdetect.php) | 4 | ||||
| -rw-r--r-- | settings/js/apps.js | 4 | ||||
| -rw-r--r-- | settings/routes.php | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/core/ajax/navigationdetect.php b/settings/ajax/navigationdetect.php index c7d0bd38dbc..93acb50dc20 100644 --- a/core/ajax/navigationdetect.php +++ b/settings/ajax/navigationdetect.php @@ -1,9 +1,5 @@ <?php -$RUNTIME_NOAPPS = true; - -require_once '../../lib/base.php'; - OC_Util::checkAdminUser(); OCP\JSON::callCheck(); diff --git a/settings/js/apps.js b/settings/js/apps.js index e45abf9b3dd..c4c36b4bb12 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -91,7 +91,7 @@ OC.Settings.Apps = OC.Settings.Apps || { return app; }, removeNavigation: function(appid){ - $.getJSON(OC.filePath('core','ajax','navigationdetect.php'), {app: appid}).done(function(response){ + $.getJSON(OC.filePath('settings', 'ajax', 'navigationdetect.php'), {app: appid}).done(function(response){ if(response.status === 'success'){ var navIds=response.nav_ids; for(var i=0; i< navIds.length; i++){ @@ -101,7 +101,7 @@ OC.Settings.Apps = OC.Settings.Apps || { }); }, addNavigation: function(appid){ - $.getJSON(OC.filePath('core','ajax','navigationdetect.php'), {app: appid}).done(function(response){ + $.getJSON(OC.filePath('settings', 'ajax', 'navigationdetect.php'), {app: appid}).done(function(response){ if(response.status === 'success'){ var navEntries=response.nav_entries; for(var i=0; i< navEntries.length; i++){ diff --git a/settings/routes.php b/settings/routes.php index 4f4f83e4542..64f4650eb8c 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -51,6 +51,8 @@ $this->create('settings_ajax_enableapp', '/settings/ajax/enableapp.php') ->actionInclude('settings/ajax/enableapp.php'); $this->create('settings_ajax_disableapp', '/settings/ajax/disableapp.php') ->actionInclude('settings/ajax/disableapp.php'); +$this->create('settings_ajax_navigationdetect', '/settings/ajax/navigationdetect.php') + ->actionInclude('settings/ajax/navigationdetect.php'); // admin $this->create('settings_ajax_getlog', '/settings/ajax/getlog.php') ->actionInclude('settings/ajax/getlog.php'); |