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
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
Sean King
admin-fe
Commits
a806a061
Commit
a806a061
authored
4 years ago
by
Angelina Filippova
Browse files
Options
Downloads
Patches
Plain Diff
Generate invite link
parent
a54d09c4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
src/lang/en.js
+1
-0
1 addition, 0 deletions
src/lang/en.js
src/views/invites/index.vue
+36
-4
36 additions, 4 deletions
src/views/invites/index.vue
with
38 additions
and
4 deletions
CHANGELOG.md
+
1
−
0
View file @
a806a061
...
...
@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
-
Put Instance Reboot button on all pages of admin-fe
-
Make Instance Reboot button's positon fixed on Settings page
-
Update jest and babel-jest
-
Generate an invite link when an invite token has been generated
### Fixed
...
...
This diff is collapsed.
Click to expand it.
src/lang/en.js
+
1
−
0
View file @
a806a061
...
...
@@ -397,6 +397,7 @@ export default {
expiresAt
:
'
Expires at
'
,
tokenCreated
:
'
Invite token was created
'
,
token
:
'
Token
'
,
inviteLink
:
'
Invite link
'
,
uses
:
'
Uses
'
,
used
:
'
Used
'
,
cancel
:
'
Cancel
'
,
...
...
This diff is collapsed.
Click to expand it.
src/views/invites/index.vue
+
36
−
4
View file @
a806a061
...
...
@@ -49,9 +49,22 @@
<div
slot=
"header"
class=
"clearfix"
>
<span>
{{
$t
(
'
invites.tokenCreated
'
)
}}
</span>
</div>
<p>
{{
this
.
$t
(
'
invites.token
'
)
}}
:
{{
newToken
.
token
}}
</p>
<p>
{{
this
.
$t
(
'
invites.maxUse
'
)
}}
:
{{
newToken
.
maxUse
}}
</p>
<p>
{{
this
.
$t
(
'
invites.expiresAt
'
)
}}
:
{{
newToken
.
expiresAt
}}
</p>
<el-form
label-width=
"80px"
class=
"new-token-card"
>
<el-form-item
:label=
"$t('invites.inviteLink')"
>
<el-link
:href=
"inviteLink"
:underline=
"false"
target=
"_blank"
>
{{
inviteLink
}}
</el-link>
</el-form-item>
<el-form-item
:label=
"$t('invites.token')"
>
{{
newToken
.
token
}}
</el-form-item>
<el-form-item
:label=
"$t('invites.maxUse')"
>
{{
newToken
.
maxUse
}}
</el-form-item>
<el-form-item
:label=
"$t('invites.expiresAt')"
>
{{
newToken
.
expiresAt
||
'
(not set)
'
}}
</el-form-item>
</el-form>
</el-card>
</el-dialog>
<el-dialog
...
...
@@ -144,6 +157,8 @@
<
script
>
import
RebootButton
from
'
@/components/RebootButton
'
import
{
mapGetters
}
from
'
vuex
'
import
{
baseName
}
from
'
@/api/utils
'
export
default
{
components
:
{
RebootButton
},
...
...
@@ -167,9 +182,15 @@ export default {
}
},
computed
:
{
...
mapGetters
([
'
authHost
'
]),
getLabelWidth
()
{
return
this
.
isDesktop
?
'
100px
'
:
'
80px
'
},
inviteLink
()
{
return
`
${
baseName
(
this
.
authHost
)}
/registration/
${
this
.
newToken
.
token
}
`
},
isDesktop
()
{
return
this
.
$store
.
state
.
app
.
device
===
'
desktop
'
},
...
...
@@ -248,7 +269,13 @@ export default {
padding
:
10px
;
}
.create-new-token-dialog
{
width
:
40%
width
:
50%
;
a
{
margin-bottom
:
3px
;
}
.el-card__body
{
padding
:
10px
20px
;
}
}
.el-dialog__body
{
padding
:
5px
20px
0
20px
...
...
@@ -283,6 +310,11 @@ export default {
line-height
:
22px
;
margin
:
0
0
10px
0
;
}
.new-token-card
{
.el-form-item
{
margin
:
0
;
}
}
.reboot-button
{
padding
:
10px
;
margin
:
0
;
...
...
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