Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
IA2
GMS
Commits
609cb6b5
Commit
609cb6b5
authored
Sep 25, 2020
by
Sonia Zorba
Browse files
Added option for showing/hiding the user id in searches
parent
1e9783fd
Changes
5
Hide whitespace changes
Inline
Side-by-side
gms-ui/.env.development
View file @
609cb6b5
VUE_APP_API_CLIENT = 'mock'
VUE_APP_API_BASE_URL = ''
VUE_APP_SHOW_USER_ID_IN_SEARCH = true
gms-ui/.env.production
View file @
609cb6b5
VUE_APP_API_CLIENT = 'server'
VUE_APP_API_BASE_URL = ''
VUE_APP_SHOW_USER_ID_IN_SEARCH = true
gms-ui/package-lock.json
View file @
609cb6b5
...
...
@@ -6573,7 +6573,8 @@
"dependencies": {
"acorn": {
"version": "6.1.1",
"resolved": "",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
"integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
"dev": true
},
"acorn-jsx": {
...
...
gms-ui/src/components/modals/SearchUser.vue
View file @
609cb6b5
...
...
@@ -17,6 +17,8 @@
</
template
>
<
script
>
const
SHOW_USER_ID_IN_SEARCH
=
process
.
env
.
VUE_APP_SHOW_USER_ID_IN_SEARCH
===
'
true
'
;
import
client
from
'
api-client
'
;
import
debounce
from
'
debounce
'
;
// for delaying the input event (search filter)
...
...
@@ -50,7 +52,7 @@ export default {
let
user
=
res
[
i
];
this
.
users
.
push
({
value
:
user
.
id
,
text
:
user
.
displayName
+
'
[
'
+
user
.
id
+
'
]
'
text
:
user
.
displayName
+
(
SHOW_USER_ID_IN_SEARCH
?
'
[
'
+
user
.
id
+
'
]
'
:
''
)
});
}
if
(
this
.
users
.
length
>
0
)
{
...
...
gms/pom.xml
View file @
609cb6b5
...
...
@@ -16,6 +16,7 @@
<properties>
<java.version>
1.8
</java.version>
<show.user_id_in_search>
true
</show.user_id_in_search>
</properties>
<dependencies>
...
...
@@ -75,6 +76,9 @@
<version>
1.7.6
</version>
<configuration>
<nodeVersion>
v12.6.0
</nodeVersion>
<environmentVariables>
<VUE_APP_SHOW_USER_ID_IN_SEARCH>
${show.user_id_in_search}
</VUE_APP_SHOW_USER_ID_IN_SEARCH>
</environmentVariables>
</configuration>
<executions>
<execution>
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment