Skip to content
Snippets Groups Projects
Commit 31bba86e authored by Michael Gapczynski's avatar Michael Gapczynski
Browse files

Fix external storage UI for Admin page

parent 1ccbbfad
No related branches found
No related tags found
No related merge requests found
...@@ -27,7 +27,7 @@ OC.MountConfig={ ...@@ -27,7 +27,7 @@ OC.MountConfig={
} }
}); });
if (addMountPoint) { if (addMountPoint) {
if ($('#externalStorage').data('admin')) { if ($('#externalStorage').data('admin') === true) {
var isPersonal = false; var isPersonal = false;
var multiselect = $(tr).find('.chzn-select').val(); var multiselect = $(tr).find('.chzn-select').val();
var oldGroups = $(tr).find('.applicable').data('applicable-groups'); var oldGroups = $(tr).find('.applicable').data('applicable-groups');
...@@ -117,7 +117,7 @@ $(document).ready(function() { ...@@ -117,7 +117,7 @@ $(document).ready(function() {
if (mountPoint == '') { if (mountPoint == '') {
return false; return false;
} }
if ($('#externalStorage').data('admin')) { if ($('#externalStorage').data('admin') === true) {
var isPersonal = false; var isPersonal = false;
var multiselect = $(tr).find('.chzn-select').val(); var multiselect = $(tr).find('.chzn-select').val();
$.each(multiselect, function(index, value) { $.each(multiselect, function(index, value) {
......
...@@ -26,7 +26,7 @@ $backends = OC_Mount_Config::getBackends(); ...@@ -26,7 +26,7 @@ $backends = OC_Mount_Config::getBackends();
// Remove local storage // Remove local storage
unset($backends['OC_Filestorage_Local']); unset($backends['OC_Filestorage_Local']);
$tmpl = new OCP\Template('files_external', 'settings'); $tmpl = new OCP\Template('files_external', 'settings');
$tmpl->assign('isAdminPage', false); $tmpl->assign('isAdminPage', false, false);
$tmpl->assign('mounts', OC_Mount_Config::getPersonalMountPoints()); $tmpl->assign('mounts', OC_Mount_Config::getPersonalMountPoints());
$tmpl->assign('backends', $backends); $tmpl->assign('backends', $backends);
return $tmpl->fetchPage(); return $tmpl->fetchPage();
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
OCP\Util::addScript('files_external', 'settings'); OCP\Util::addScript('files_external', 'settings');
OCP\Util::addStyle('files_external', 'settings'); OCP\Util::addStyle('files_external', 'settings');
$tmpl = new OCP\Template('files_external', 'settings'); $tmpl = new OCP\Template('files_external', 'settings');
$tmpl->assign('isAdminPage', true); $tmpl->assign('isAdminPage', true, false);
$tmpl->assign('mounts', OC_Mount_Config::getSystemMountPoints()); $tmpl->assign('mounts', OC_Mount_Config::getSystemMountPoints());
$tmpl->assign('backends', OC_Mount_Config::getBackends()); $tmpl->assign('backends', OC_Mount_Config::getBackends());
$tmpl->assign('groups', OC_Group::getGroups()); $tmpl->assign('groups', OC_Group::getGroups());
......
<form id="files_external"> <form id="files_external">
<fieldset class="personalblock"> <fieldset class="personalblock">
<legend><strong><?php echo $l->t('External Storage'); ?></strong></legend> <legend><strong><?php echo $l->t('External Storage'); ?></strong></legend>
<table id="externalStorage" data-admin="<?php echo json_encode($_['isAdminPage']); ?>"> <table id="externalStorage" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
<thead> <thead>
<tr> <tr>
<th><?php echo $l->t('Mount point'); ?></th> <th><?php echo $l->t('Mount point'); ?></th>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment