From 31bba86e8753ce3a1d7821c195f64ebfb052e01d Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 28 Jun 2012 17:54:53 -0400
Subject: [PATCH] Fix external storage UI for Admin page
---
apps/files_external/js/settings.js | 4 ++--
apps/files_external/personal.php | 2 +-
apps/files_external/settings.php | 2 +-
apps/files_external/templates/settings.php | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 57188a6a26..49b7710638 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -27,7 +27,7 @@ OC.MountConfig={
}
});
if (addMountPoint) {
- if ($('#externalStorage').data('admin')) {
+ if ($('#externalStorage').data('admin') === true) {
var isPersonal = false;
var multiselect = $(tr).find('.chzn-select').val();
var oldGroups = $(tr).find('.applicable').data('applicable-groups');
@@ -117,7 +117,7 @@ $(document).ready(function() {
if (mountPoint == '') {
return false;
}
- if ($('#externalStorage').data('admin')) {
+ if ($('#externalStorage').data('admin') === true) {
var isPersonal = false;
var multiselect = $(tr).find('.chzn-select').val();
$.each(multiselect, function(index, value) {
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index 32e0874244..b758e7e7eb 100755
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -26,7 +26,7 @@ $backends = OC_Mount_Config::getBackends();
// Remove local storage
unset($backends['OC_Filestorage_Local']);
$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('backends', $backends);
return $tmpl->fetchPage();
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index 983855ecdc..acc9036b29 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -23,7 +23,7 @@
OCP\Util::addScript('files_external', 'settings');
OCP\Util::addStyle('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('backends', OC_Mount_Config::getBackends());
$tmpl->assign('groups', OC_Group::getGroups());
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 6c37df8001..7777593d74 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -1,7 +1,7 @@
<form id="files_external">
<fieldset class="personalblock">
<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>
<tr>
<th><?php echo $l->t('Mount point'); ?></th>
--
GitLab