Commit 16ea2ec1 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'feature/all_merge_requets' of /home/git/repositories/gitlab/gitlabhq

parents a16d7558 b1970e0c
...@@ -50,16 +50,30 @@ class DashboardController < ApplicationController ...@@ -50,16 +50,30 @@ class DashboardController < ApplicationController
@projects = @projects.page(params[:page]).per(30) @projects = @projects.page(params[:page]).per(30)
end end
# Get authored or assigned open merge requests
def merge_requests def merge_requests
@merge_requests = current_user.cared_merge_requests @merge_requests = case params[:scope]
when 'authored' then
current_user.merge_requests
when 'all' then
MergeRequest.where(target_project_id: current_user.authorized_projects.pluck(:id))
else
current_user.assigned_merge_requests
end
@merge_requests = FilterContext.new(@merge_requests, params).execute @merge_requests = FilterContext.new(@merge_requests, params).execute
@merge_requests = @merge_requests.recent.page(params[:page]).per(20) @merge_requests = @merge_requests.recent.page(params[:page]).per(20)
end end
# Get only assigned issues
def issues def issues
@issues = current_user.assigned_issues @issues = case params[:scope]
when 'authored' then
current_user.issues
when 'all' then
Issue.where(project_id: current_user.authorized_projects.pluck(:id))
else
current_user.assigned_issues
end
@issues = FilterContext.new(@issues, params).execute @issues = FilterContext.new(@issues, params).execute
@issues = @issues.recent.page(params[:page]).per(20) @issues = @issues.recent.page(params[:page]).per(20)
@issues = @issues.includes(:author, :project) @issues = @issues.includes(:author, :project)
......
%h3.page-title %h3.page-title
Issues assigned to me Issues
%span.pull-right #{@issues.total_count} issues %span.pull-right #{@issues.total_count} issues
%p.light %p.light
For all issues you should visit the project's issues page, or use the search panel to find a specific issue. List all issues from all project's you have access to.
%hr %hr
.row .row
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
%p.light %p.light
Only merge requests created by you or assigned to you are listed here. List all merge requests from all project's you have access to.
%hr %hr
.row .row
.span3 .span3
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
= nav_link(path: 'dashboard#merge_requests') do = nav_link(path: 'dashboard#merge_requests') do
= link_to merge_requests_dashboard_path do = link_to merge_requests_dashboard_path do
Merge Requests Merge Requests
%span.count= current_user.cared_merge_requests.opened.count %span.count= current_user.assigned_merge_requests.opened.count
= nav_link(controller: :help) do = nav_link(controller: :help) do
= link_to "Help", help_path = link_to "Help", help_path
= form_tag filter_path(entity), method: 'get' do = form_tag filter_path(entity), method: 'get' do
%fieldset %fieldset.scope-filter
%ul.nav.nav-pills.nav-stacked
%li{class: ("active" if params[:scope].blank?)}
= link_to filter_path(entity, scope: nil) do
Assigned to me
%li{class: ("active" if params[:scope] == 'authored')}
= link_to filter_path(entity, scope: 'authored') do
Authored by me
%li{class: ("active" if params[:scope] == 'all')}
= link_to filter_path(entity, scope: 'all') do
All
%fieldset.status-filter
%ul.nav.nav-pills.nav-stacked %ul.nav.nav-pills.nav-stacked
%li{class: ("active" if params[:status].blank?)} %li{class: ("active" if params[:status].blank?)}
= link_to filter_path(entity, status: nil) do = link_to filter_path(entity, status: nil) do
......
Feature: Dashboard Issues Feature: Dashboard Issues
Background: Background:
Given I sign in as a user Given I sign in as a user
And I have authored issues
And I have assigned issues And I have assigned issues
And I have other issues
And I visit dashboard issues page And I visit dashboard issues page
Scenario: I should see issues list Scenario: I should see assigned issues
Then I should see issues assigned to me Then I should see issues assigned to me
Scenario: I should see authored issues
When I click "Authored by me" link
Then I should see issues authored by me
Scenario: I should see all issues
When I click "All" link
Then I should see all issues
...@@ -2,7 +2,17 @@ Feature: Dashboard Merge Requests ...@@ -2,7 +2,17 @@ Feature: Dashboard Merge Requests
Background: Background:
Given I sign in as a user Given I sign in as a user
And I have authored merge requests And I have authored merge requests
And I have assigned merge requests
And I have other merge requests
And I visit dashboard merge requests page And I visit dashboard merge requests page
Scenario: I should see projects list Scenario: I should see assigned merge_requests
Then I should see my merge requests Then I should see merge requests assigned to me
Scenario: I should see authored merge_requests
When I click "Authored by me" link
Then I should see merge requests authored by me
Scenario: I should see all merge_requests
When I click "All" link
Then I should see all merge requests
...@@ -2,19 +2,73 @@ class DashboardIssues < Spinach::FeatureSteps ...@@ -2,19 +2,73 @@ class DashboardIssues < Spinach::FeatureSteps
include SharedAuthentication include SharedAuthentication
include SharedPaths include SharedPaths
Then 'I should see issues assigned to me' do step 'I should see issues assigned to me' do
issues = @user.issues should_see(assigned_issue)
issues.each do |issue| should_not_see(authored_issue)
should_not_see(other_issue)
end
step 'I should see issues authored by me' do
should_see(authored_issue)
should_not_see(assigned_issue)
should_not_see(other_issue)
end
step 'I should see all issues' do
should_see(authored_issue)
should_see(assigned_issue)
should_see(other_issue)
end
step 'I have authored issues' do
authored_issue
end
step 'I have assigned issues' do
assigned_issue
end
step 'I have other issues' do
other_issue
end
step 'I click "Authored by me" link' do
within ".scope-filter" do
click_link 'Authored by me'
end
end
step 'I click "All" link' do
within ".scope-filter" do
click_link 'All'
end
end
def should_see(issue)
page.should have_content(issue.title[0..10]) page.should have_content(issue.title[0..10])
page.should have_content(issue.project.name)
page.should have_link(issue.project.name)
end end
def should_not_see(issue)
page.should_not have_content(issue.title[0..10])
end
def assigned_issue
@assigned_issue ||= create :issue, assignee: current_user, project: project
end
def authored_issue
@authored_issue ||= create :issue, author: current_user, project: project
end end
And 'I have assigned issues' do def other_issue
project = create :project @other_issue ||= create :issue, project: project
project.team << [@user, :master] end
2.times { create :issue, author: @user, assignee: @user, project: project } def project
@project ||= begin
project =create :project_with_code
project.team << [current_user, :master]
project
end
end end
end end
...@@ -2,28 +2,73 @@ class DashboardMergeRequests < Spinach::FeatureSteps ...@@ -2,28 +2,73 @@ class DashboardMergeRequests < Spinach::FeatureSteps
include SharedAuthentication include SharedAuthentication
include SharedPaths include SharedPaths
Then 'I should see my merge requests' do step 'I should see merge requests assigned to me' do
merge_requests = @user.merge_requests should_see(assigned_merge_request)
merge_requests.each do |mr| should_not_see(authored_merge_request)
page.should have_content(mr.title[0..10]) should_not_see(other_merge_request)
page.should have_content(mr.target_project.name)
page.should have_content(mr.source_project.name)
end end
step 'I should see merge requests authored by me' do
should_see(authored_merge_request)
should_not_see(assigned_merge_request)
should_not_see(other_merge_request)
end
step 'I should see all merge requests' do
should_see(authored_merge_request)
should_see(assigned_merge_request)
should_see(other_merge_request)
end
step 'I have authored merge requests' do
authored_merge_request
end
step 'I have assigned merge requests' do
assigned_merge_request
end end
And 'I have authored merge requests' do step 'I have other merge requests' do
project1_source = create :project other_merge_request
project1_target= create :project end
project2_source = create :project
project2_target = create :project
step 'I click "Authored by me" link' do
within ".scope-filter" do
click_link 'Authored by me'
end
end
project1_source.team << [@user, :master] step 'I click "All" link' do
project1_target.team << [@user, :master] within ".scope-filter" do
project2_source.team << [@user, :master] click_link 'All'
project2_target.team << [@user, :master] end
end
merge_request1 = create :merge_request, author: @user, source_project: project1_source, target_project: project1_target def should_see(merge_request)
merge_request2 = create :merge_request, author: @user, source_project: project2_source, target_project: project2_target page.should have_content(merge_request.title[0..10])
end
def should_not_see(merge_request)
page.should_not have_content(merge_request.title[0..10])
end
def assigned_merge_request
@assigned_merge_request ||= create :merge_request, assignee: current_user, target_project: project
end
def authored_merge_request
@authored_merge_request ||= create :merge_request, author: current_user, target_project: project
end
def other_merge_request
@other_merge_request ||= create :merge_request, target_project: project
end
def project
@project ||= begin
project =create :project_with_code
project.team << [current_user, :master]
project
end
end end
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