Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
034f1f07
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,发现更多精彩内容 >>
提交
034f1f07
编写于
8月 05, 2016
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Correctly filters by labels
上级
69458c0e
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
27 addition
and
11 deletion
+27
-11
app/assets/javascripts/boards/models/issue.js.es6
app/assets/javascripts/boards/models/issue.js.es6
+6
-0
app/assets/javascripts/boards/models/list.js.es6
app/assets/javascripts/boards/models/list.js.es6
+9
-9
app/assets/javascripts/boards/stores/boards_store.js.es6
app/assets/javascripts/boards/stores/boards_store.js.es6
+5
-1
app/assets/javascripts/labels_select.js
app/assets/javascripts/labels_select.js
+7
-1
未找到文件。
app/assets/javascripts/boards/models/issue.js.es6
浏览文件 @
034f1f07
...
@@ -38,6 +38,12 @@ class Issue {
...
@@ -38,6 +38,12 @@ class Issue {
}
}
}
}
removeLabels (labels) {
labels.forEach((label) => {
this.removeLabel(label);
});
}
getLists () {
getLists () {
return _.filter(BoardsStore.state.lists, (list) => {
return _.filter(BoardsStore.state.lists, (list) => {
return list.findIssue(this.id);
return list.findIssue(this.id);
...
...
app/assets/javascripts/boards/models/list.js.es6
浏览文件 @
034f1f07
...
@@ -54,7 +54,13 @@ class List {
...
@@ -54,7 +54,13 @@ class List {
}
}
getIssues (emptyIssues = true) {
getIssues (emptyIssues = true) {
const data = _.extend({ page: this.page }, this.filters);
let data = _.extend({ page: this.page }, this.filters);
if (this.label) {
data.label_name = _.reject(data.label_name, (label) => {
return label === this.label.title;
});
}
if (emptyIssues) {
if (emptyIssues) {
this.loading = true;
this.loading = true;
...
@@ -93,18 +99,12 @@ class List {
...
@@ -93,18 +99,12 @@ class List {
});
});
}
}
removeIssue (removeIssue
, listLabels
) {
removeIssue (removeIssue) {
this.issues = _.reject(this.issues, (issue) => {
this.issues = _.reject(this.issues, (issue) => {
const matchesRemove = removeIssue.id === issue.id;
const matchesRemove = removeIssue.id === issue.id;
if (matchesRemove) {
if (matchesRemove) {
if (typeof listLabels !== 'undefined') {
issue.removeLabel(this.label);
listLabels.forEach((listLabel) => {
issue.removeLabel(listLabel);
});
} else {
issue.removeLabel(this.label);
}
}
}
return matchesRemove;
return matchesRemove;
...
...
app/assets/javascripts/boards/stores/boards_store.js.es6
浏览文件 @
034f1f07
...
@@ -98,7 +98,10 @@
...
@@ -98,7 +98,10 @@
listTo = this.findList('id', listToId),
listTo = this.findList('id', listToId),
issueTo = listTo.findIssue(issueId);
issueTo = listTo.findIssue(issueId);
let issue = listFrom.findIssue(issueId);
let issue = listFrom.findIssue(issueId);
const issueLists = issue.getLists();
const issueLists = issue.getLists(),
issueLabels = issueLists.map(function (issue) {
return issue.label;
});
listFrom.removeIssue(issue);
listFrom.removeIssue(issue);
// Add to new lists issues if it doesn't already exist
// Add to new lists issues if it doesn't already exist
...
@@ -112,6 +115,7 @@
...
@@ -112,6 +115,7 @@
issueLists.forEach((list) => {
issueLists.forEach((list) => {
list.removeIssue(issue);
list.removeIssue(issue);
});
});
issue.removeLabels(issueLabels);
}
}
},
},
findList: function (key, val) {
findList: function (key, val) {
...
...
app/assets/javascripts/labels_select.js
浏览文件 @
034f1f07
...
@@ -304,7 +304,13 @@
...
@@ -304,7 +304,13 @@
isIssueIndex
=
page
===
'
projects:issues:index
'
;
isIssueIndex
=
page
===
'
projects:issues:index
'
;
isMRIndex
=
page
===
'
projects:merge_requests:index
'
;
isMRIndex
=
page
===
'
projects:merge_requests:index
'
;
if
(
page
===
'
projects:boards:show
'
)
{
if
(
page
===
'
projects:boards:show
'
)
{
BoardsStore
.
state
.
filters
[
'
label_name
'
].
push
(
label
.
title
);
if
(
label
.
title
)
{
BoardsStore
.
state
.
filters
[
'
label_name
'
].
push
(
label
.
title
);
}
else
{
var
labelIndex
=
BoardsStore
.
state
.
filters
[
'
label_name
'
].
indexOf
(
label
.
text
());
BoardsStore
.
state
.
filters
[
'
label_name
'
].
splice
(
labelIndex
,
1
);
}
BoardsStore
.
updateFiltersUrl
();
BoardsStore
.
updateFiltersUrl
();
e
.
preventDefault
();
e
.
preventDefault
();
return
;
return
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录