Revert "Remove unrequired route"; respect OOXML settings again

This reverts commit aa89c908a7.
pull/60/head
Pranav Kant 7 years ago
parent aeeb31d4c7
commit 0c14789cc3

@ -25,5 +25,6 @@ return [
//settings //settings
['name' => 'settings#setSettings', 'url' => 'ajax/admin.php', 'verb' => 'POST'], ['name' => 'settings#setSettings', 'url' => 'ajax/admin.php', 'verb' => 'POST'],
['name' => 'settings#getSettings', 'url' => 'ajax/settings.php', 'verb' => 'GET'],
] ]
]; ];

@ -119,8 +119,8 @@ var odfViewer = {
$('#richdocumentsframe').remove(); $('#richdocumentsframe').remove();
}, },
registerFilesMenu: function() { registerFilesMenu: function(response) {
var ooxml = false; var ooxml = response.doc_format === 'ooxml';
var docExt, spreadsheetExt, presentationExt; var docExt, spreadsheetExt, presentationExt;
var docMime, spreadsheetMime, presentationMime; var docMime, spreadsheetMime, presentationMime;
@ -208,7 +208,12 @@ $(document).ready(function() {
&& typeof OCA.Files.fileActions !== 'undefined' && typeof OCA.Files.fileActions !== 'undefined'
) { ) {
odfViewer.register(); odfViewer.register();
odfViewer.registerFilesMenu();
$.get(
OC.filePath('richdocuments', 'ajax', 'settings.php'),
{},
odfViewer.registerFilesMenu
);
} }
}); });

@ -45,6 +45,18 @@ class SettingsController extends Controller{
$this->discoveryManager = $discoveryManager; $this->discoveryManager = $discoveryManager;
} }
/**
* @NoAdminRequired
*
* @return JSONResponse
*/
public function getSettings() {
return new JSONResponse([
'doc_format' => $this->appConfig->getAppValue('doc_format'),
'wopi_url' => $this->appConfig->getAppValue('wopi_url'),
]);
}
/** /**
* @param string $wopi_url * @param string $wopi_url
* @param string $doc_format * @param string $doc_format

Loading…
Cancel
Save