Show assigned issues/mr be default on dashboard
This was default before but now it fixed with providing assignee_id parameter making url shareble and dont reset when other filters users. Also this commit removes old methods that are not used any more. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
a7b7a2dd4c
commit
465f186954
4 changed files with 9 additions and 42 deletions
|
@ -257,10 +257,6 @@ class ApplicationController < ActionController::Base
|
|||
# or improve current implementation to filter only issues you
|
||||
# created or assigned or mentioned
|
||||
#@filter_params[:authorized_only] = true
|
||||
|
||||
unless @filter_params[:assignee_id]
|
||||
@filter_params[:assignee_id] = current_user.id
|
||||
end
|
||||
end
|
||||
|
||||
@filter_params
|
||||
|
|
|
@ -1,13 +1,4 @@
|
|||
module DashboardHelper
|
||||
def entities_per_project(project, entity)
|
||||
case entity.to_sym
|
||||
when :issue then @issues.where(project_id: project.id)
|
||||
when :merge_request then @merge_requests.where(target_project_id: project.id)
|
||||
else
|
||||
[]
|
||||
end.count
|
||||
end
|
||||
|
||||
def projects_dashboard_filter_path(options={})
|
||||
exist_opts = {
|
||||
sort: params[:sort],
|
||||
|
@ -22,32 +13,11 @@ module DashboardHelper
|
|||
path
|
||||
end
|
||||
|
||||
def assigned_entities_count(current_user, entity, scope = nil)
|
||||
items = current_user.send('assigned_' + entity.pluralize)
|
||||
get_count(items, scope)
|
||||
def assigned_issues_dashboard_path
|
||||
issues_dashboard_path(assignee_id: current_user.id)
|
||||
end
|
||||
|
||||
def authored_entities_count(current_user, entity, scope = nil)
|
||||
items = current_user.send(entity.pluralize)
|
||||
get_count(items, scope)
|
||||
end
|
||||
|
||||
def authorized_entities_count(current_user, entity, scope = nil)
|
||||
items = entity.classify.constantize
|
||||
get_count(items, scope, true, current_user)
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def get_count(items, scope, get_authorized = false, current_user = nil)
|
||||
items = items.opened
|
||||
if scope.kind_of?(Group)
|
||||
items = items.of_group(scope)
|
||||
elsif scope.kind_of?(Project)
|
||||
items = items.of_projects(scope)
|
||||
elsif get_authorized
|
||||
items = items.of_projects(current_user.authorized_projects)
|
||||
end
|
||||
items.count
|
||||
def assigned_mrs_dashboard_path
|
||||
merge_requests_dashboard_path(assignee_id: current_user.id)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -10,13 +10,13 @@
|
|||
%span
|
||||
Projects
|
||||
= nav_link(path: 'dashboard#issues') do
|
||||
= link_to issues_dashboard_path, class: 'shortcuts-issues' do
|
||||
= link_to assigned_issues_dashboard_path, class: 'shortcuts-issues' do
|
||||
%i.fa.fa-exclamation-circle
|
||||
%span
|
||||
Issues
|
||||
%span.count= current_user.assigned_issues.opened.count
|
||||
= nav_link(path: 'dashboard#merge_requests') do
|
||||
= link_to merge_requests_dashboard_path, class: 'shortcuts-merge_requests' do
|
||||
= link_to assigned_mrs_dashboard_path, class: 'shortcuts-merge_requests' do
|
||||
%i.fa.fa-tasks
|
||||
%span
|
||||
Merge Requests
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
module SharedPaths
|
||||
include Spinach::DSL
|
||||
include RepoHelpers
|
||||
include DashboardHelper
|
||||
|
||||
step 'I visit new project page' do
|
||||
visit new_project_path
|
||||
|
@ -71,11 +72,11 @@ module SharedPaths
|
|||
end
|
||||
|
||||
step 'I visit dashboard issues page' do
|
||||
visit issues_dashboard_path
|
||||
visit assigned_issues_dashboard_path
|
||||
end
|
||||
|
||||
step 'I visit dashboard merge requests page' do
|
||||
visit merge_requests_dashboard_path
|
||||
visit assigned_mrs_dashboard_path
|
||||
end
|
||||
|
||||
step 'I visit dashboard search page' do
|
||||
|
|
Loading…
Reference in a new issue