Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b4253735
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b4253735
编写于
5月 30, 2017
作者:
A
Alfredo Sumaran
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix toggling subgroups and pagination
上级
6f859430
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
24 addition
and
7 deletion
+24
-7
app/assets/javascripts/groups/components/group_item.vue
app/assets/javascripts/groups/components/group_item.vue
+1
-1
app/assets/javascripts/groups/index.js
app/assets/javascripts/groups/index.js
+9
-1
app/assets/javascripts/groups/services/groups_service.js
app/assets/javascripts/groups/services/groups_service.js
+1
-1
app/assets/javascripts/groups/stores/groups_store.js
app/assets/javascripts/groups/stores/groups_store.js
+13
-4
未找到文件。
app/assets/javascripts/groups/components/group_item.vue
浏览文件 @
b4253735
...
...
@@ -14,7 +14,7 @@ export default {
},
methods
:
{
toggleSubGroups
(
e
)
{
if
(
e
.
target
.
tagName
===
'
A
'
||
!
this
.
hasSubgroups
)
{
if
(
e
.
target
.
tagName
===
'
A
'
||
!
this
.
hasSubgroups
)
{
return
false
;
}
...
...
app/assets/javascripts/groups/index.js
浏览文件 @
b4253735
...
...
@@ -34,12 +34,18 @@ $(() => {
fetchGroups
(
parentGroup
)
{
let
parentId
=
null
;
let
getGroups
=
null
;
let
page
=
null
;
let
pageParam
=
null
;
if
(
parentGroup
)
{
parentId
=
parentGroup
.
id
;
}
const
page
=
gl
.
utils
.
getParameterByName
(
'
page
'
);
pageParam
=
gl
.
utils
.
getParameterByName
(
'
page
'
);
if
(
pageParam
)
{
page
=
pageParam
;
}
getGroups
=
service
.
getGroups
(
parentId
,
page
);
getGroups
.
then
((
response
)
=>
{
...
...
@@ -53,8 +59,10 @@ $(() => {
},
toggleSubGroups
(
parentGroup
=
null
)
{
if
(
!
parentGroup
.
isOpen
)
{
store
.
resetGroups
(
parentGroup
);
this
.
fetchGroups
(
parentGroup
);
}
GroupsStore
.
toggleSubGroups
(
parentGroup
);
},
},
...
...
app/assets/javascripts/groups/services/groups_service.js
浏览文件 @
b4253735
...
...
@@ -8,7 +8,7 @@ export default class GroupsService {
this
.
groups
=
Vue
.
resource
(
endpoint
);
}
getGroups
(
parentId
,
page
=
1
)
{
getGroups
(
parentId
,
page
)
{
const
data
=
{};
if
(
parentId
)
{
...
...
app/assets/javascripts/groups/stores/groups_store.js
浏览文件 @
b4253735
/* eslint-disable class-methods-use-this */
export
default
class
GroupsStore
{
constructor
()
{
this
.
state
=
{};
...
...
@@ -9,7 +10,7 @@ export default class GroupsStore {
setGroups
(
rawGroups
,
parent
=
null
)
{
const
parentGroup
=
parent
;
const
tree
=
this
.
buildTree
(
rawGroups
);
const
tree
=
this
.
buildTree
(
rawGroups
,
parentGroup
);
if
(
parentGroup
)
{
parentGroup
.
subGroups
=
tree
;
...
...
@@ -20,6 +21,11 @@ export default class GroupsStore {
return
tree
;
}
resetGroups
(
parent
)
{
const
parentGroup
=
parent
;
parentGroup
.
subGroups
=
{};
}
storePagination
(
pagination
=
{})
{
let
paginationInfo
;
...
...
@@ -33,7 +39,7 @@ export default class GroupsStore {
this
.
state
.
pageInfo
=
paginationInfo
;
}
buildTree
(
rawGroups
)
{
buildTree
(
rawGroups
,
parentGroup
)
{
const
groups
=
this
.
decorateGroups
(
rawGroups
);
const
tree
=
{};
const
mappedGroups
=
{};
...
...
@@ -49,11 +55,14 @@ export default class GroupsStore {
Object
.
keys
(
mappedGroups
).
map
((
key
)
=>
{
const
currentGroup
=
mappedGroups
[
key
];
// If the group is not at the root level, add it to its parent array of subGroups.
const
parentGroup
=
mappedGroups
[
currentGroup
.
parentId
];
const
findParentGroup
=
mappedGroups
[
currentGroup
.
parentId
];
if
(
currentGroup
.
parentId
)
{
if
(
p
arentGroup
)
{
if
(
findP
arentGroup
)
{
mappedGroups
[
currentGroup
.
parentId
].
subGroups
[
currentGroup
.
id
]
=
currentGroup
;
mappedGroups
[
currentGroup
.
parentId
].
isOpen
=
true
;
// Expand group if it has subgroups
}
else
if
(
parentGroup
&&
parentGroup
.
id
===
currentGroup
.
parentId
)
{
tree
[
currentGroup
.
id
]
=
currentGroup
;
}
else
{
// Means the groups hast no direct parent.
// Save for later processing, we will add them to its corresponding base group
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录