upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 10:10:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Merge pull request #12748 from nextcloud/backport/14/11200/stable14

Browse source 
[stable14] Fix interaction with groups that contain a slash
This commit is contained in:
Roeland Jago Douma 2018-12-04 15:03:11 +01:00 committed by GitHub
commit de83581694
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/provisioning_api/appinfo/routes.php
View file

@ -35,12 +35,12 @@ return [
// Groups
['root' => '/cloud', 'name' => 'Groups#getGroups', 'url' => '/groups', 'verb' => 'GET'],
['root' => '/cloud', 'name' => 'Groups#getGroupsDetails', 'url' => '/groups/details', 'verb' => 'GET'],
['root' => '/cloud', 'name' => 'Groups#getGroup', 'url' => '/groups/{groupId}', 'verb' => 'GET'],
['root' => '/cloud', 'name' => 'Groups#getGroupUsers', 'url' => '/groups/{groupId}/users', 'verb' => 'GET'],
['root' => '/cloud', 'name' => 'Groups#getGroupUsersDetails', 'url' => '/groups/{groupId}/users/details', 'verb' => 'GET'],
['root' => '/cloud', 'name' => 'Groups#getGroupUsers', 'url' => '/groups/{groupId}/users', 'verb' => 'GET', 'requirements' => ['groupId' => '.+']],
['root' => '/cloud', 'name' => 'Groups#getGroupUsersDetails', 'url' => '/groups/{groupId}/users/details', 'verb' => 'GET', 'requirements' => ['groupId' => '.+']],
['root' => '/cloud', 'name' => 'Groups#getSubAdminsOfGroup', 'url' => '/groups/{groupId}/subadmins', 'verb' => 'GET', 'requirements' => ['groupId' => '.+']],
['root' => '/cloud', 'name' => 'Groups#addGroup', 'url' => '/groups', 'verb' => 'POST'],
['root' => '/cloud', 'name' => 'Groups#getGroup', 'url' => '/groups/{groupId}', 'verb' => 'GET', 'requirements' => ['groupId' => '.+']],
['root' => '/cloud', 'name' => 'Groups#deleteGroup', 'url' => '/groups/{groupId}', 'verb' => 'DELETE', 'requirements' => ['groupId' => '.+']],
['root' => '/cloud', 'name' => 'Groups#getSubAdminsOfGroup', 'url' => '/groups/{groupId}/subadmins', 'verb' => 'GET'],
// Users
['root' => '/cloud', 'name' => 'Users#getUsers', 'url' => '/users', 'verb' => 'GET'],

2
settings/js/settings-vue.js
View file

@ -160,7 +160,7 @@ t.exports=function(t){return null!=t&&(n(t)||function(t){return"function"==typeo
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/i.default.use(Vt);var qe=new Vt({mode:"history",base:OC.generateUrl(""),linkActiveClass:"active",routes:[{path:"/:index(index.php/)?settings/users",component:Oe,props:!0,name:"users",children:[{path:":selectedGroup",name:"group",component:Oe}]},{path:"/:index(index.php/)?settings/apps",component:Ye,props:!0,name:"apps",children:[{path:":category",name:"apps-category",component:Ye,children:[{path:":id",name:"apps-details",component:Ye}]}]}]}),We=function(t){if(Number(t.version.split(".")[0])>=2)t.mixin({beforeCreate:n});else{var e=t.prototype._init;t.prototype._init=function(t){void 0===t&&(t={}),t.init=t.init?[n].concat(t.init):n,e.call(this,t)}}function n(){var t=this.$options;t.store?this.$store="function"==typeof t.store?t.store():t.store:t.parent&&t.parent.$store&&(this.$store=t.parent.$store)}},Je="undefined"!=typeof window&&window.__VUE_DEVTOOLS_GLOBAL_HOOK__;
*/i.default.use(Vt);var qe=new Vt({mode:"history",base:OC.generateUrl(""),linkActiveClass:"active",routes:[{path:"/:index(index.php/)?settings/users",component:Oe,props:!0,name:"users",children:[{path:":selectedGroup(.*)",name:"group",component:Oe}]},{path:"/:index(index.php/)?settings/apps",component:Ye,props:!0,name:"apps",children:[{path:":category",name:"apps-category",component:Ye,children:[{path:":id",name:"apps-details",component:Ye}]}]}]}),We=function(t){if(Number(t.version.split(".")[0])>=2)t.mixin({beforeCreate:n});else{var e=t.prototype._init;t.prototype._init=function(t){void 0===t&&(t={}),t.init=t.init?[n].concat(t.init):n,e.call(this,t)}}function n(){var t=this.$options;t.store?this.$store="function"==typeof t.store?t.store():t.store:t.parent&&t.parent.$store&&(this.$store=t.parent.$store)}},Je="undefined"!=typeof window&&window.__VUE_DEVTOOLS_GLOBAL_HOOK__;
/**
* vuex v3.0.1
* (c) 2017 Evan You

2
settings/js/settings-vue.js.map
View file

File diff suppressed because one or more lines are too long

2
settings/routes.php
View file

@ -65,7 +65,7 @@ $application->registerRoutes($this, [
['name' => 'Users#setUserSettings', 'url' => '/settings/users/{username}/settings', 'verb' => 'PUT'],
['name' => 'Users#getVerificationCode', 'url' => '/settings/users/{account}/verify', 'verb' => 'GET'],
['name' => 'Users#usersList', 'url' => '/settings/users', 'verb' => 'GET'],
['name' => 'Users#usersListByGroup', 'url' => '/settings/users/{group}', 'verb' => 'GET'],
['name' => 'Users#usersListByGroup', 'url' => '/settings/users/{group}', 'verb' => 'GET', 'requirements' => ['group' => '.+']],
['name' => 'LogSettings#setLogLevel', 'url' => '/settings/admin/log/level', 'verb' => 'POST'],
['name' => 'LogSettings#getEntries', 'url' => '/settings/admin/log/entries', 'verb' => 'GET'],
['name' => 'LogSettings#download', 'url' => '/settings/admin/log/download', 'verb' => 'GET'],

2
settings/src/router.js
View file

@ -51,7 +51,7 @@ export default new Router({
name: 'users',
children: [
{
path: ':selectedGroup',
path: ':selectedGroup(.*)',
name: 'group',
component: Users
}