summaryrefslogtreecommitdiffstats
path: root/settings/apps.php
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-09-09 18:00:53 +0200
committerVincent Petry <pvince81@owncloud.com>2014-09-09 18:04:00 +0200
commit0d28ba06625466adda4cc985d701962843eb5be2 (patch)
tree8313afc1f99c59f09847d1cc03fef75f2dda78b7 /settings/apps.php
parent39f5580cdf154256a7586fa57c8e7f094a9721a9 (diff)
downloadnextcloud-server-0d28ba06625466adda4cc985d701962843eb5be2.tar.gz
nextcloud-server-0d28ba06625466adda4cc985d701962843eb5be2.zip
Added select2 on the apps page
Moved setupGroupsSelect() from admin.js to a common settings.js as OC.Settings.setupGoupsSelect(). Now using select2 as well on the apps page.
Diffstat (limited to 'settings/apps.php')
-rw-r--r--settings/apps.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/settings/apps.php b/settings/apps.php
index 7573c8b573f..6021574cbb3 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -24,17 +24,17 @@
OC_Util::checkAdminUser();
// Load the files we need
-OC_Util::addStyle( "settings", "settings" );
-OC_Util::addScript("core", "multiselect");
+OCP\Util::addStyle('settings', 'settings' );
+OCP\Util::addScript('settings', 'settings');
+OCP\Util::addScript('core', 'select2/select2');
+OCP\Util::addStyle('core', 'select2/select2');
OC_App::setActiveNavigationEntry( "core_apps" );
$combinedApps = OC_App::listAllApps();
-$groups = \OC_Group::getGroups();
$tmpl = new OC_Template( "settings", "apps", "user" );
$tmpl->assign('apps', $combinedApps);
-$tmpl->assign('groups', $groups);
$appid = (isset($_GET['appid'])?strip_tags($_GET['appid']):'');