Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
admin-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pleroma
admin-fe
Commits
28c28335
Commit
28c28335
authored
6 years ago
by
Angelina Filippova
Browse files
Options
Downloads
Patches
Plain Diff
Return select multiple filters
parent
b8b7e4b0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!11
Add ability to read reports
,
!10
Add more users filters
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/store/modules/users.js
+4
-11
4 additions, 11 deletions
src/store/modules/users.js
src/views/users/components/UsersFilter.vue
+7
-16
7 additions, 16 deletions
src/views/users/components/UsersFilter.vue
with
11 additions
and
27 deletions
src/store/modules/users.js
+
4
−
11
View file @
28c28335
...
...
@@ -42,8 +42,8 @@ const users = {
SET_SEARCH_QUERY
:
(
state
,
query
)
=>
{
state
.
searchQuery
=
query
},
SET_USERS_FILTER
:
(
state
,
filter
s
)
=>
{
state
.
filters
=
filters
SET_USERS_FILTER
:
(
state
,
filter
)
=>
{
state
.
filters
[
filter
]
=
!
state
.
filters
[
filter
]
}
},
actions
:
{
...
...
@@ -72,15 +72,8 @@ const users = {
loadUsers
(
commit
,
page
,
response
.
data
)
}
},
async
ToggleUsersFilter
({
commit
,
dispatch
,
state
},
filters
)
{
const
newFilters
=
Object
.
keys
(
state
.
filters
).
reduce
((
acc
,
filter
)
=>
{
if
(
filters
.
includes
(
filter
))
{
return
{
...
acc
,
[
filter
]:
true
}
}
else
{
return
{
...
acc
,
[
filter
]:
false
}
}
},
{})
commit
(
'
SET_USERS_FILTER
'
,
newFilters
)
async
ToggleUsersFilter
({
commit
,
dispatch
,
state
},
filter
)
{
commit
(
'
SET_USERS_FILTER
'
,
filter
)
// dispatch('SearchUsers', { query: state.searchQuery, page: 1 })
},
async
ToggleRight
({
commit
,
getters
},
{
user
,
right
})
{
...
...
This diff is collapsed.
Click to expand it.
src/views/users/components/UsersFilter.vue
+
7
−
16
View file @
28c28335
...
...
@@ -28,19 +28,19 @@ export default {
label
:
'
By user type
'
,
options
:
[{
label
:
'
Local
'
,
value
:
'
userType/
showLocalUsersOnly
'
value
:
'
showLocalUsersOnly
'
},
{
label
:
'
External
'
,
value
:
'
userType/
showExternalUsersOnly
'
value
:
'
showExternalUsersOnly
'
}]
},
{
label
:
'
By status
'
,
options
:
[{
label
:
'
Active
'
,
value
:
'
userStatus/
showActiveUsersOnly
'
value
:
'
showActiveUsersOnly
'
},
{
label
:
'
Deactivated
'
,
value
:
'
userStatus/
showDeactivatedUsersOnly
'
value
:
'
showDeactivatedUsersOnly
'
}]
}],
value
:
[]
...
...
@@ -52,18 +52,9 @@ export default {
}
},
methods
:
{
handleFilterToggle
(
value
)
{
const
reversed
=
value
.
reverse
()
const
userTypeFilter
=
reversed
.
find
(
filter
=>
filter
.
includes
(
'
userType
'
))
const
userStatusFilter
=
reversed
.
find
(
filter
=>
filter
.
includes
(
'
userStatus
'
))
const
filters
=
[
userTypeFilter
,
userStatusFilter
].
filter
(
item
=>
item
)
this
.
$data
.
value
=
filters
const
filtersWithoutGroupnames
=
filters
.
reduce
((
acc
,
item
)
=>
{
const
filter
=
item
.
split
(
'
/
'
)[
1
]
acc
.
push
(
filter
)
return
acc
},
[])
this
.
$store
.
dispatch
(
'
ToggleUsersFilter
'
,
filtersWithoutGroupnames
)
handleFilterToggle
(
filters
)
{
const
currentFilter
=
filters
[
filters
.
length
-
1
]
this
.
$store
.
dispatch
(
'
ToggleUsersFilter
'
,
currentFilter
)
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment