Commit aeb9db67 authored by Oswaldo Ferreira's avatar Oswaldo Ferreira
Browse files

Present group and dashboard MR list without grouping by project

parent d54b3da7a362
......@@ -4,6 +4,7 @@ class DashboardController < Dashboard::ApplicationController
before_action :event_filter, only: :activity
before_action :projects, only: [:issues, :merge_requests]
before_action :set_show_full_reference, only: [:issues, :merge_requests]
respond_to :html
......@@ -34,4 +35,8 @@ def load_events
@events = @event_filter.apply_filter(@events).with_associations
@events = @events.limit(20).offset(params[:offset] || 0)
end
def set_show_full_reference
@show_full_reference = true
end
end
......@@ -97,10 +97,10 @@ def self.sort(method, excluded_labels: [])
end
end
def to_reference(from = nil, full_path: false)
def to_reference(from = nil, full: false)
reference = "#{self.class.reference_prefix}#{iid}"
"#{project.to_reference(from, full_path: full_path)}#{reference}"
"#{project.to_reference(from, full: full)}#{reference}"
end
def referenced_merge_requests(current_user = nil)
......
......@@ -591,10 +591,12 @@ def to_param
end
end
def to_reference(from = nil, full_path: false)
return path_with_namespace if full_path
path_from(from)
def to_reference(from = nil, full: false)
if full || cross_namespace_reference?(from)
path_with_namespace
elsif cross_project_reference?(from)
path
end
end
def to_human_reference(from_project = nil)
......@@ -1289,19 +1291,12 @@ def environments_recently_updated_on_branch(branch)
private
def path_from(from)
if cross_namespace_reference?(from)
path_with_namespace
elsif cross_project_reference?(from)
path
end
end
def cross_namespace_reference?(from)
if from.is_a?(Project)
from && namespace != from.namespace
else
from && namespace != from
case from
when Project
namespace != from.namespace
when Namespace
namespace != from
end
end
......
......@@ -34,13 +34,8 @@
= note_count
.issue-info
- if controller_name == "dashboard"
#{issue.to_reference(full_path: true)}
- else
#{issue.to_reference(@group || @project)}
= @show_full_reference ? issue.to_reference(full: true) : issue.to_reference(@group || @project)
&middot;
opened #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')}
by #{link_to_member(@project, issue.author, avatar: false)}
- if issue.milestone
......
......@@ -46,7 +46,8 @@
= note_count
.merge-request-info
#{merge_request.to_reference} &middot;
= @show_full_reference ? merge_request.to_reference(full: true) : merge_request.to_reference(@group || @project)
&middot;
opened #{time_ago_with_tooltip(merge_request.created_at, placement: 'bottom')}
by #{link_to_member(@project, merge_request.author, avatar: false)}
- if merge_request.target_project.default_branch != merge_request.target_branch
......
- if @merge_requests.to_a.any?
- @merge_requests.group_by(&:target_project).each do |group|
.panel.panel-default.panel-small
- project = group[0]
.panel-heading
= link_to project.name_with_namespace, namespace_project_merge_requests_path(project.namespace, project)
- if can?(current_user, :create_merge_request, project)
.pull-right
= link_to 'New merge request', new_namespace_project_merge_request_path(project.namespace, project)
.panel.panel-default.panel-small
%ul.content-list.mr-list
= render partial: 'projects/merge_requests/merge_request', collection: @merge_requests
%ul.content-list.mr-list
- group[1].each do |merge_request|
= render 'projects/merge_requests/merge_request', merge_request: merge_request
= paginate @merge_requests, theme: "gitlab"
- else
......
......@@ -34,11 +34,11 @@
end
end
context 'when full_path is true' do
context 'when full is true' do
it 'returns complete path to the issue' do
expect(issue.to_reference(full_path: true)).to eq 'sample-namespace/sample-project#1'
expect(issue.to_reference(project, full_path: true)).to eq 'sample-namespace/sample-project#1'
expect(issue.to_reference(group, full_path: true)).to eq 'sample-namespace/sample-project#1'
expect(issue.to_reference(full: true)).to eq 'sample-namespace/sample-project#1'
expect(issue.to_reference(project, full: true)).to eq 'sample-namespace/sample-project#1'
expect(issue.to_reference(group, full: true)).to eq 'sample-namespace/sample-project#1'
end
end
......
......@@ -293,11 +293,11 @@
end
end
context 'when full_path is true' do
context 'when full is true' do
it 'returns complete path to the project' do
expect(project.to_reference(full_path: true)).to eq 'sample-namespace/sample-project'
expect(project.to_reference(project, full_path: true)).to eq 'sample-namespace/sample-project'
expect(project.to_reference(group, full_path: true)).to eq 'sample-namespace/sample-project'
expect(project.to_reference(full: true)).to eq 'sample-namespace/sample-project'
expect(project.to_reference(project, full: true)).to eq 'sample-namespace/sample-project'
expect(project.to_reference(group, full: true)).to eq 'sample-namespace/sample-project'
end
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment