From f9b4084f522f9112f69d672e25e5545302f2341c Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 16 Sep 2020 15:34:10 +0200
Subject: [PATCH] Show group display name in workflows
Signed-off-by: Joas Schilling <coding@schilljs.com>
---
apps/workflowengine/js/workflowengine.js | Bin 1357789 -> 1357758 bytes
apps/workflowengine/js/workflowengine.js.map | Bin 3600327 -> 3600271 bytes
.../components/Checks/RequestUserGroup.vue | 13 ++++++-------
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/apps/workflowengine/js/workflowengine.js b/apps/workflowengine/js/workflowengine.js
index 93dc804593cd7ec37047a2f7ee878e88f8d17efb..b49940a3452b42d2448f80b1bf38959be734da7e 100644
GIT binary patch
delta 205
zcmccnK4{<jpoSL47N!>F7M3lnTY5MWP0Z6$l9LUl7g{pQZ0BX<oW(p{PmzPKy<q|?
z5VHX>I}mdKF((jn0Wmia^8hg~5QEh51F--Q3j(pw_J#?<URCTSMwW@DY3AE6a*5nn
zz^<Q?T9TNVGkwKs5%1}XLpeqDO7s#_QrwI3OA9orGgGWm^)gd*QZkDRauO@^5_405
W0!X~t?Xhb_9GKvSE?FmH$q4`s{Y)hQ
delta 215
zcmdn@KIrcIpoSL47N!>F7M3lnTY5MQEG^AajFMBQ7g{pQZ0BX<oW(p{PmzPKy<q|?
z5VHX>I}mdKF((jn0Wmia^8hg~5QEh51F--Q3j(pw_J#?<URCTyX31s-hH2X`a*5nn
zFn!}{5wGcwbXbL_8<=o%swkxD6_gfdXjEsWSe59cWEL0XBv$4n=B8Se)N1Oa0&#Tg
pbVGg-k?9UjtXw=LdWk71?nU{f1sbW_?be7mFu{#)T_<A62>?v_OT+*G
diff --git a/apps/workflowengine/js/workflowengine.js.map b/apps/workflowengine/js/workflowengine.js.map
index d9ecd01842d6d034ee67cfd6e33a259276756cc5..8012f50eb9da422eca84a3df2a72f2fd7c934e5c 100644
GIT binary patch
delta 710
zcmY+>PiWIn90zb>tL>c5&b6znb#`-Vy4L<PdF>pE=~|1I7V$Jpk<g?r(spCb#3Gx6
zfw`z11bhQQ@Z?qOAr}!nd6<U{Zz>EgJN52mpx+ErC*kwu<@er?{2uwd^POqK+aE(t
zMM?9<Cz&;h-au#E`>Wzi@YRel_N3%g(wUSYHQCO_!`6U<o05#552n{jx?a*5I0O!G
z!eKZ9E^tF19EE;32FGClPM9U#^W0U;6oeTe%FS3gYsD=qB3YpzL|fTjHIlOmw}nR5
z$~y9<khdZyL=!n{xs=V<ZqWFeXO-Sv@g((b+XI7e5{AGFJ{Sf+oPrSunBDg2?RPFN
zH6`)YG)>;&N6gUm;4tHsxO7#nR1);VWH6xnazQu)qi_~NFb3mr4kq9{T!4$fLKr3?
z0#UdGF^EF~l8}PSz?r@r@AKQEm>5N6?6)_sMV{&VJ0&U8)h_3!omqZb-z)RxUYWeC
zyW+B<NotM0*d+HKSLYY=Qe}>1?=8+RErdf?uZ13o4N<cnZBA{*Bv~$4+w6Z^qNd7M
zLi>F&RgNC)5;a+EF4Uw}L#iwGnFFQX;X&&=%i({$%jU-~WW(XMuRsMiVd>@;Nz%l7
q5}@l_BurN*@29_?l72e6O(yKS@Bb89d`5PAmGunyW`@6#SHVAA6Za?p
delta 647
zcmYMuziSg=7zc1-FDCUzO>LT(_S8%3k4t-AleG78sZ@N^i=h@g#i=w=(wu2dXcC$P
z3}Pu%JST%>cngAygOeb3IB;`vFoSWlf&K$ooE-Ig+9)rdFVFMv4&Ua%zUwo*?~ZUp
zHD+6%46${~KejjF|C#4hwUB6qpXr>smLRQMRovTs)EMFtN=|Kcw&r(q%hD|u9DxDg
zzzs*i16~+}V{jZ!z)2W_Q?_pTUU=?R({zzaWRWgYNvAidbjR73omfxO6qS~o(bSx5
zB%NGwVp^kVD&3`(q?2Xj(%;V-m7<z6)|08y4K}mm+h+H-d@-xr^uaKkh7s_?C<Gt~
zXCMS)cDFg+`QV9@Jc-5%EWE0OY~OW0;PONh31Y<a?A;VUZn-rc&cZo34+4Z?0w&=C
zT!c$-8AOP{6ikBzS3rgth(ZkFFbi|GTT@1Z{U$b=n6Ccz_GLzK4IY*xSyt)I1=*Vw
z<*L=oDt0eRUTv`E7h<x7hB7IX*B;81dbKD%&Xh8>|Iak$1+(^GgV8qOxj$2>O+xHx
zLkY-FBw;lhkqhO`R4!i>#r4f{y%G@?t_iiGS(S5!k#;VJcl&vp><)PQjabY}M0Wct
X`PgsFhCAffzhzq`-|ZjY$ZP&LBc0dM
diff --git a/apps/workflowengine/src/components/Checks/RequestUserGroup.vue b/apps/workflowengine/src/components/Checks/RequestUserGroup.vue
index c7e0b45b667..f9f6226b4e4 100644
--- a/apps/workflowengine/src/components/Checks/RequestUserGroup.vue
+++ b/apps/workflowengine/src/components/Checks/RequestUserGroup.vue
@@ -84,14 +84,13 @@ export default {
}
this.status.isLoading = true
- return axios.get(generateOcsUrl('cloud', 2) + 'groups?limit=20&search=' + encodeURI(searchQuery)).then((response) => {
- response.data.ocs.data.groups.reduce((obj, item) => {
- obj.push({
- id: item,
- displayname: item,
+ return axios.get(generateOcsUrl('cloud', 2) + 'groups/details?limit=20&search=' + encodeURI(searchQuery)).then((response) => {
+ response.data.ocs.data.groups.forEach((group) => {
+ this.addGroup({
+ id: group.id,
+ displayname: group.displayname,
})
- return obj
- }, []).forEach((group) => this.addGroup(group))
+ })
this.status.isLoading = false
}, (error) => {
console.error('Error while loading group list', error.response)
--
GitLab