kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Do not allow to expand a row if group doesn’t have subgroups

Browse source
This commit is contained in:
Alfredo Sumaran 2017-05-30 03:53:40 -05:00
parent fb1e7eae99
commit d15521c79d
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/groups/components/group_item.vue
View file

@ -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 = '';

1
app/assets/javascripts/groups/stores/groups_store.js
View file

@ -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,