diff options
| author | Julius Härtl <github@jus.li> | 2016-12-24 13:51:40 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-24 13:51:40 +0300 |
| commit | 36f1690b54f9d046f9a51398718b03b1f175c710 (patch) | |
| tree | 6170e9622371a7236438d447ea53e4889951bf66 | |
| parent | 72cea97c65507b6f3b8f80ab48edffa1438540ba (diff) | |
| parent | e993c82705b5b302026a33819700e83e341383c0 (diff) | |
Merge pull request #26 from juliushaertl/move-endpoints
Move endpoints and remove double requesttoken
| -rw-r--r-- | appinfo/routes.php | 6 | ||||
| -rw-r--r-- | controller/settingscontroller.php | 1 | ||||
| -rw-r--r-- | js/apporder.js | 8 |
3 files changed, 6 insertions, 9 deletions
diff --git a/appinfo/routes.php b/appinfo/routes.php index a40b514..c37beea 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -24,8 +24,8 @@ return [ 'routes' => [ ['name' => 'app#index', 'url' => '/', 'verb' => 'GET'], - ['name' => 'settings#getOrder', 'url' => 'ajax/order.php', 'verb' => 'GET'], - ['name' => 'settings#savePersonal', 'url' => 'ajax/personal.php', 'verb' => 'GET'], - ['name' => 'settings#saveDefaultOrder', 'url' => 'ajax/admin.php', 'verb' => 'GET'], + ['name' => 'settings#getOrder', 'url' => '/getOrder', 'verb' => 'GET'], + ['name' => 'settings#savePersonal', 'url' => '/savePersonal', 'verb' => 'POST'], + ['name' => 'settings#saveDefaultOrder', 'url' => '/saveDefaultOrder', 'verb' => 'POST'], ] ]; diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php index 8c714ba..1a65ea7 100644 --- a/controller/settingscontroller.php +++ b/controller/settingscontroller.php @@ -105,5 +105,4 @@ class SettingsController extends Controller { return $response; } - } diff --git a/js/apporder.js b/js/apporder.js index ae2e2c1..90dfba8 100644 --- a/js/apporder.js +++ b/js/apporder.js @@ -7,7 +7,7 @@ $(function () { app_menu.hide(); // restore existing order - $.get(OC.filePath('apporder', 'ajax', 'order.php'), {requesttoken: oc_requesttoken}, function (data) { + $.get(OC.generateUrl('/apps/apporder/getOrder'), function (data) { var json = data.order; var order = [] try { @@ -41,9 +41,8 @@ $(function () { }); var json = JSON.stringify(items); - $.get(OC.filePath('apporder', 'ajax', 'personal.php'), { + $.post(OC.generateUrl('/apps/apporder/savePersonal'), { order: json, - requesttoken: oc_requesttoken }, function (data) { $(event.srcElement).fadeTo('fast', 0.5).fadeTo('fast', 1.0); }); @@ -61,9 +60,8 @@ $(function () { items.push(item) }); var json = JSON.stringify(items); - $.get(OC.filePath('apporder', 'ajax', 'admin.php'), { + $.post(OC.generateUrl('/apps/apporder/saveDefaultOrder'), { order: json, - requesttoken: oc_requesttoken }, function (data) { $(event.srcElement).effect("highlight", {}, 1000); }); |