diff options
| -rw-r--r-- | appinfo/routes.php | 1 | ||||
| -rw-r--r-- | controller/documentcontroller.php | 1 | ||||
| -rw-r--r-- | controller/settingscontroller.php | 8 | ||||
| -rw-r--r-- | js/settings.js | 15 | ||||
| -rw-r--r-- | lib/appconfig.php | 3 | ||||
| -rw-r--r-- | templates/documents.php | 1 | ||||
| -rw-r--r-- | templates/settings.php | 15 |
7 files changed, 1 insertions, 43 deletions
diff --git a/appinfo/routes.php b/appinfo/routes.php index a94790b3..89f2b5d8 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -42,7 +42,6 @@ $application->registerRoutes($this, [ ['name' => 'document#wopiPutFile', 'url' => 'wopi/files/{fileId}/contents', 'verb' => 'POST'], //settings ['name' => 'settings#savePersonal', 'url' => 'ajax/personal.php', 'verb' => 'POST'], - ['name' => 'settings#setUnstable', 'url' => 'ajax/config/unstable', 'verb' => 'POST'], ['name' => 'settings#setSettings', 'url' => 'ajax/admin.php', 'verb' => 'POST'], ['name' => 'settings#getSupportedMimes', 'url' => 'ajax/mimes.php', 'verb' => 'GET'], ] diff --git a/controller/documentcontroller.php b/controller/documentcontroller.php index ed794e3c..e82d77a8 100644 --- a/controller/documentcontroller.php +++ b/controller/documentcontroller.php @@ -105,7 +105,6 @@ class DocumentController extends Controller{ $wopiRemote = $this->settings->getAppValue('richdocuments', 'wopi_url'); $response = new TemplateResponse('richdocuments', 'documents', [ 'enable_previews' => $this->settings->getSystemValue('enable_previews', true), - 'useUnstable' => $this->settings->getAppValue('richdocuments', 'unstable', 'false'), 'savePath' => $this->settings->getUserValue($this->uid, 'richdocuments', 'save_path', '/'), 'uploadMaxFilesize' => $maxUploadFilesize, 'uploadMaxHumanFilesize' => \OCP\Util::humanFileSize($maxUploadFilesize), diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php index da97f662..61b5d840 100644 --- a/controller/settingscontroller.php +++ b/controller/settingscontroller.php @@ -63,7 +63,6 @@ class SettingsController extends Controller{ return new TemplateResponse( $this->appName, 'settings', - [ 'unstable' => $this->appConfig->getAppValue('unstable') ], 'blank' ); } @@ -111,13 +110,6 @@ class SettingsController extends Controller{ return $response; } - public function setUnstable($unstable){ - if (!is_null($unstable)){ - $this->appConfig->setAppValue('unstable', $unstable); - } - return array('status' => 'success'); - } - public function setSettings($wopi_url){ if (!is_null($wopi_url)){ $this->appConfig->setAppValue('wopi_url', $wopi_url); diff --git a/js/settings.js b/js/settings.js deleted file mode 100644 index b27fafaf..00000000 --- a/js/settings.js +++ /dev/null @@ -1,15 +0,0 @@ -$(document).ready(function(){ - - var documentsSettings = { - save : function() { - var data = { - unstable : $('#webodf-unstable').attr('checked')==="checked" - }; - $.post(OC.generateUrl('apps/richdocuments/ajax/config/unstable'), data, documentsSettings.afterSave); - }, - afterSave : function(){ - documentsMain.useUnstable = $('#webodf-unstable').attr('checked')==="checked"; - } - }; - $('#webodf-unstable').change(documentsSettings.save); -});
\ No newline at end of file diff --git a/lib/appconfig.php b/lib/appconfig.php index f50b019b..bc255d22 100644 --- a/lib/appconfig.php +++ b/lib/appconfig.php @@ -16,8 +16,7 @@ use \OCP\IConfig; class AppConfig{ private $appName = 'richdocuments'; private $defaults = [ - 'unstable' => 'false', - 'wopi_url' => 'htpp://localhost' + 'wopi_url' => 'http://localhost' ]; private $config; diff --git a/templates/documents.php b/templates/documents.php index 0c68ed4b..012d99ed 100644 --- a/templates/documents.php +++ b/templates/documents.php @@ -51,7 +51,6 @@ script('files', 'jquery.fileupload'); </ul> </div> <input type="hidden" id="wopi-url" name="wopi-url" value="<?php p($_['wopi_url']) ?>" /> -<input type="hidden" id="webodf-unstable" value="<?php p($_['useUnstable']) ?>" /> <?php if ($_['enable_previews']): ?> <input type="hidden" id="previews_enabled" value="<?php p($_['enable_previews']) ?>" /> <?php endif; ?> diff --git a/templates/settings.php b/templates/settings.php deleted file mode 100644 index 5d1b88af..00000000 --- a/templates/settings.php +++ /dev/null @@ -1,15 +0,0 @@ -<?php -script('richdocuments', 'settings'); -?> -<div id="documents" class="section"> - <h2><?php p($l->t('Documents')) ?></h2> - <input id="webodf-unstable" type ="checkbox" - <?php if ($_['unstable'] === 'true'){ ?> - checked="checked" - <?php } ?> - /> - <label for="webodf-unstable"> - <?php p($l->t('Advanced feature-set'))?> - <?php p($l->t('(Unstable)')); ?> - </label> -</div> |