Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
e583df54
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
e583df54
编写于
1月 20, 2014
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Dont override project_id params when use issues/mr filtering
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
74187621
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
2 addition
and
4 deletion
+2
-4
app/controllers/projects/issues_controller.rb
app/controllers/projects/issues_controller.rb
+1
-2
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+1
-2
未找到文件。
app/controllers/projects/issues_controller.rb
浏览文件 @
e583df54
...
...
@@ -118,8 +118,7 @@ class Projects::IssuesController < Projects::ApplicationController
def
issues_filtered
params
[
:scope
]
=
'all'
if
params
[
:scope
].
blank?
params
[
:state
]
=
'opened'
if
params
[
:state
].
blank?
params
[
:project_id
]
=
@project
.
id
@issues
=
FilteringService
.
new
.
execute
(
Issue
,
current_user
,
params
)
@issues
=
FilteringService
.
new
.
execute
(
Issue
,
current_user
,
params
.
merge
(
project_id:
@project
.
id
))
end
# Since iids are implemented only in 6.1
...
...
app/controllers/projects/merge_requests_controller.rb
浏览文件 @
e583df54
...
...
@@ -20,9 +20,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
params
[
:sort
]
||=
'newest'
params
[
:scope
]
=
'all'
if
params
[
:scope
].
blank?
params
[
:state
]
=
'opened'
if
params
[
:state
].
blank?
params
[
:project_id
]
=
@project
.
id
@merge_requests
=
FilteringService
.
new
.
execute
(
MergeRequest
,
current_user
,
params
)
@merge_requests
=
FilteringService
.
new
.
execute
(
MergeRequest
,
current_user
,
params
.
merge
(
project_id:
@project
.
id
)
)
@merge_requests
=
@merge_requests
.
page
(
params
[
:page
]).
per
(
20
)
@sort
=
params
[
:sort
].
humanize
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录