-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #10968 from owncloud/admin-groupsselect2
Use select2 for the groups excluded from sharing in admin page
- Loading branch information
Showing
68 changed files
with
153 additions
and
113 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| /** | ||
| * Copyright (c) 2014, Vincent Petry <[email protected]> | ||
| * This file is licensed under the Affero General Public License version 3 or later. | ||
| * See the COPYING-README file. | ||
| */ | ||
| OC.Settings = OC.Settings || {}; | ||
| OC.Settings = _.extend(OC.Settings, { | ||
|
|
||
| _cachedGroups: null, | ||
|
|
||
| /** | ||
| * Setup selection box for group selection. | ||
| * | ||
| * Values need to be separated by a pipe "|" character. | ||
| * (mostly because a comma is more likely to be used | ||
| * for groups) | ||
| * | ||
| * @param $elements jQuery element (hidden input) to setup select2 on | ||
| * @param [extraOptions] extra options hash to pass to select2 | ||
| */ | ||
| setupGroupsSelect: function($elements, extraOptions) { | ||
| var self = this; | ||
| if ($elements.length > 0) { | ||
| // note: settings are saved through a "change" event registered | ||
| // on all input fields | ||
| $elements.select2(_.extend({ | ||
| placeholder: t('core', 'Groups'), | ||
| allowClear: true, | ||
| multiple: true, | ||
| separator: '|', | ||
| query: _.debounce(function(query) { | ||
| var queryData = {}; | ||
| if (self._cachedGroups && query.term === '') { | ||
| query.callback({results: self._cachedGroups}); | ||
| return; | ||
| } | ||
| if (query.term !== '') { | ||
| queryData = { | ||
| pattern: query.term, | ||
| filterGroups: 1 | ||
| }; | ||
| } | ||
| $.ajax({ | ||
| url: OC.generateUrl('/settings/ajax/grouplist'), | ||
| data: queryData, | ||
| dataType: 'json', | ||
| success: function(data) { | ||
| if (data.status === "success") { | ||
| var results = []; | ||
|
|
||
| // add groups | ||
| $.each(data.data.adminGroups, function(i, group) { | ||
| results.push({id:group.id, displayname:group.name}); | ||
| }); | ||
| $.each(data.data.groups, function(i, group) { | ||
| results.push({id:group.id, displayname:group.name}); | ||
| }); | ||
|
|
||
| if (query.term === '') { | ||
| // cache full list | ||
| self._cachedGroups = results; | ||
| } | ||
| query.callback({results: results}); | ||
| } else { | ||
| //FIXME add error handling | ||
| } | ||
| } | ||
| }); | ||
| }, 100, true), | ||
| id: function(element) { | ||
| return element.id; | ||
| }, | ||
| initSelection: function(element, callback) { | ||
| var selection = | ||
| _.map(($(element).val() || []).split('|').sort(), | ||
| function(groupName) { | ||
| return { | ||
| id: groupName, | ||
| displayname: groupName | ||
| }; | ||
| }); | ||
| callback(selection); | ||
| }, | ||
| formatResult: function (element) { | ||
| return escapeHTML(element.displayname); | ||
| }, | ||
| formatSelection: function (element) { | ||
| return escapeHTML(element.displayname); | ||
| }, | ||
| escapeMarkup: function(m) { | ||
| // prevent double markup escape | ||
| return m; | ||
| } | ||
| }, extraOptions || {})); | ||
| } | ||
| } | ||
| }); | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters