Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
nanocloud
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor 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
Nanocloud
nanocloud
Commits
ce43db44
Commit
ce43db44
authored
8 years ago
by
corentindrouet
Committed by
Romain Soufflet
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Didn't show team of users if the option is disable (#475)
parent
642eba40
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
assets/app/protected/users/index/controller.js
+1
-0
1 addition, 0 deletions
assets/app/protected/users/index/controller.js
assets/app/protected/users/index/table/user-list/team-setting/template.hbs
+22
-18
22 additions, 18 deletions
...ted/users/index/table/user-list/team-setting/template.hbs
with
23 additions
and
18 deletions
assets/app/protected/users/index/controller.js
+
1
−
0
View file @
ce43db44
...
@@ -25,6 +25,7 @@
...
@@ -25,6 +25,7 @@
import
Ember
from
'
ember
'
;
import
Ember
from
'
ember
'
;
export
default
Ember
.
Controller
.
extend
({
export
default
Ember
.
Controller
.
extend
({
configController
:
Ember
.
inject
.
controller
(
'
protected.configs
'
),
store
:
Ember
.
inject
.
service
(
'
store
'
),
store
:
Ember
.
inject
.
service
(
'
store
'
),
activator
:
function
()
{
activator
:
function
()
{
...
...
This diff is collapsed.
Click to expand it.
assets/app/protected/users/index/table/user-list/team-setting/template.hbs
+
22
−
18
View file @
ce43db44
{{#if
record
.
team
.
name
}}
{{#if
targetObject
.
configController
.
teamEnabled
}}
{{
record
.
team
.
name
}}
{{#if
record
.
team
.
name
}}
{{else}}
{{
record
.
team
.
name
}}
-
{{else}}
{{/if}}
-
{{#if
targetObject
.
teams
.
length
}}
{{/if}}
<div
class=
'rel in-bl fright'
{{
action
toggleUserSetting
record
}}
>
{{#if
targetObject
.
teams
.
length
}}
<div
class=
'rel in-bl fright'
{{
action
toggleUserSetting
record
}}
>
{{
icon-component
class
=
'va-sub color-primary clickable color-default'
hover-darker
=
true
materialIcon
=
'settings'
size
=
16
}}
{{
icon-component
class
=
'va-sub color-primary clickable color-default'
hover-darker
=
true
materialIcon
=
'settings'
size
=
16
}}
{{#if
record
.
teamOptionIsOpen
}}
{{#if
record
.
teamOptionIsOpen
}}
{{#
popup-component
isOpen
=
record
.
teamOptionIsOpen
close
=
closePopup
position
=
"left"
}}
{{#
popup-component
isOpen
=
record
.
teamOptionIsOpen
close
=
closePopup
position
=
"left"
}}
<div
class=
"list-group"
>
<div
class=
"list-group"
>
<a
href=
"#"
class=
"list-group-item list-group-item-action unclickable active"
><span
class=
'va-tb'
>
Teams
</span></a>
<a
href=
"#"
class=
"list-group-item list-group-item-action unclickable active"
><span
class=
'va-tb'
>
Teams
</span></a>
{{#
each
targetObject
.
teams
as
|
team
|
}}
{{#
each
targetObject
.
teams
as
|
team
|
}}
<a
href=
"#"
class=
"list-group-item list-group-item-action"
{{
action
changeUserTeam
record
team
}}
>
{{
team
.
name
}}
<a
href=
"#"
class=
"list-group-item list-group-item-action"
{{
action
changeUserTeam
record
team
}}
>
{{
team
.
name
}}
{{#if
(
is-equal
team
.
id
record
.
team
.
id
)
}}
{{#if
(
is-equal
team
.
id
record
.
team
.
id
)
}}
{{
icon-component
materialIcon
=
'done'
class
=
'color-primary in-bl va-sub fright'
size
=
16
}}
{{
icon-component
materialIcon
=
'done'
class
=
'color-primary in-bl va-sub fright'
size
=
16
}}
{{/if}}
{{/if}}
</a>
</a>
{{/
each
}}
{{/
each
}}
</div>
</div>
{{/
popup-component
}}
{{/
popup-component
}}
{{/if}}
{{/if}}
</div>
</div>
{{/if}}
{{else}}
-
{{/if}}
{{/if}}
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