decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

add Find: Group to Manage Users, #1878

Browse source
This commit is contained in:
j 2014-09-30 14:26:14 +02:00
parent 3cdb0e23cc
commit 511858804a
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pandora/user/managers.py
View file

@ -9,6 +9,8 @@ def parseCondition(condition, user):
k = { k = {
'email': 'user__email', 'email': 'user__email',
'user': 'username', 'user': 'username',
'group': 'user__groups__name',
'groups': 'user__groups__name',
}.get(k, k) }.get(k, k)
v = condition['value'] v = condition['value']
op = condition.get('operator') op = condition.get('operator')

2
pandora/user/views.py
View file

@ -477,7 +477,7 @@ def findUsers(request):
} }
possible query keys: possible query keys:
username, email, lastLogin, browser username, email, lastLogin, browser, groups
returns { returns {
items: [ items: [

8
static/js/usersDialog.js
View file

@ -65,7 +65,8 @@ pandora.ui.usersDialog = function() {
items: [ items: [
{id: 'all', title: Ox._('Find: All')}, {id: 'all', title: Ox._('Find: All')},
{id: 'username', title: Ox._('Find: Username')}, {id: 'username', title: Ox._('Find: Username')},
{id: 'email', title: Ox._('Find: E-Mail Address')} {id: 'email', title: Ox._('Find: E-Mail Address')},
{id: 'group', title: Ox._('Find: Group')}
], ],
overlap: 'right', overlap: 'right',
type: 'image' type: 'image'
@ -964,8 +965,9 @@ pandora.ui.usersDialog = function() {
query = { query = {
conditions: value conditions: value
? [].concat( ? [].concat(
key != 'email' ? [{key: 'username', value: value, operator: '='}] : [], Ox.contains(['username', 'all'], key) ? [{key: 'username', value: value, operator: '='}] : [],
key != 'username' ? [{key: 'email', value: value, operator: '='}] : [] Ox.contains(['email', 'all'], key) ? [{key: 'email', value: value, operator: '='}] : [],
Ox.contains(['group', 'all'], key) ? [{key: 'group', value: value, operator: '='}] : []
) )
: [].concat( : [].concat(
!guests ? [{key: 'level', value: 'guest', operator: '!='}] : [], !guests ? [{key: 'level', value: 'guest', operator: '!='}] : [],