Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d15521c7
Commit
d15521c7
authored
May 30, 2017
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not allow to expand a row if group doesn’t have subgroups
parent
fb1e7eae
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
app/assets/javascripts/groups/components/group_item.vue
app/assets/javascripts/groups/components/group_item.vue
+2
-6
app/assets/javascripts/groups/stores/groups_store.js
app/assets/javascripts/groups/stores/groups_store.js
+1
-0
No files found.
app/assets/javascripts/groups/components/group_item.vue
View file @
d15521c7
...
...
@@ -14,7 +14,7 @@ export default {
},
methods
:
{
toggleSubGroups
(
e
)
{
if
(
e
.
target
.
tagName
===
'
A
'
||
!
this
.
hasSubgroups
)
{
if
(
e
.
target
.
tagName
===
'
A
'
||
!
this
.
group
.
hasSubgroups
)
{
return
false
;
}
...
...
@@ -39,14 +39,10 @@ export default {
return
{
'
group-row
'
:
true
,
'
is-open
'
:
this
.
group
.
isOpen
,
'
has-subgroups
'
:
this
.
hasSubgroups
,
'
has-subgroups
'
:
this
.
group
.
hasSubgroups
,
'
no-description
'
:
!
this
.
group
.
description
,
};
},
hasSubgroups
()
{
// TODO: Server should send a flag to indicate group will have subgroups
return
true
;
},
fullPath
()
{
let
fullPath
=
''
;
...
...
app/assets/javascripts/groups/stores/groups_store.js
View file @
d15521c7
...
...
@@ -117,6 +117,7 @@ export default class GroupsStore {
fullName
:
rawGroup
.
full_name
,
fullPath
:
rawGroup
.
full_path
,
name
:
rawGroup
.
name
,
hasSubgroups
:
rawGroup
.
has_subgroups
,
canEdit
:
rawGroup
.
can_edit
,
description
:
rawGroup
.
description
,
webUrl
:
rawGroup
.
web_url
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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