Commit 6caba1d1 authored by Eugenia Grieff's avatar Eugenia Grieff

Review changes

- Use parent in issuable actions to avoid overriding method
- Use local variable for can_bulk_update in issues template
- Use local_assigns to pass group variable in shared template
- Use #group method in bulk update controller instead of variable
- Rename spec context because parent is no longer present
parent c2447160
...@@ -181,7 +181,7 @@ module IssuableActions ...@@ -181,7 +181,7 @@ module IssuableActions
end end
def authorize_admin_issuable! def authorize_admin_issuable!
unless can?(current_user, :"admin_#{resource_name}", @project) # rubocop:disable Gitlab/ModuleWithInstanceVariables unless can?(current_user, :"admin_#{resource_name}", parent) # rubocop:disable Gitlab/ModuleWithInstanceVariables
return access_denied! return access_denied!
end end
end end
......
- @can_bulk_update = can?(current_user, :admin_issue, @group) - can_bulk_update = can?(current_user, :admin_issue, @group)
- page_title "Issues" - page_title "Issues"
= content_for :meta_tags do = content_for :meta_tags do
...@@ -12,14 +12,14 @@ ...@@ -12,14 +12,14 @@
.nav-controls .nav-controls
= render 'shared/issuable/feed_buttons' = render 'shared/issuable/feed_buttons'
- if @can_bulk_update - if can_bulk_update
= render_if_exists 'shared/issuable/bulk_update_button' = render_if_exists 'shared/issuable/bulk_update_button'
= render 'shared/new_project_item_select', path: 'issues/new', label: "New issue", type: :issues, with_feature_enabled: 'issues', with_shared: false, include_projects_in_subgroups: true = render 'shared/new_project_item_select', path: 'issues/new', label: "New issue", type: :issues, with_feature_enabled: 'issues', with_shared: false, include_projects_in_subgroups: true
= render 'shared/issuable/search_bar', type: :issues = render 'shared/issuable/search_bar', type: :issues
- if @can_bulk_update - if can_bulk_update
= render_if_exists 'shared/issuable/group_bulk_update_sidebar', type: :issues = render_if_exists 'shared/issuable/group_bulk_update_sidebar', group: @group, type: :issues
= render 'shared/issues' = render 'shared/issues'
...@@ -9,11 +9,6 @@ module EE ...@@ -9,11 +9,6 @@ module EE
weight weight
].freeze ].freeze
override :authorize_admin_issuable!
def authorize_admin_issuable!
return access_denied! unless can?(current_user, :"admin_#{resource_name}", parent)
end
override :permitted_keys override :permitted_keys
def permitted_keys def permitted_keys
@permitted_keys ||= (super + EE_PERMITTED_KEYS).freeze @permitted_keys ||= (super + EE_PERMITTED_KEYS).freeze
......
...@@ -9,6 +9,6 @@ class Groups::BulkUpdateController < Groups::ApplicationController ...@@ -9,6 +9,6 @@ class Groups::BulkUpdateController < Groups::ApplicationController
private private
def verify_group_bulk_edit_enabled! def verify_group_bulk_edit_enabled!
render_404 unless @group.feature_available?(:group_bulk_edit) render_404 unless group.feature_available?(:group_bulk_edit)
end end
end end
- group = local_assigns.fetch(:group)
- type = local_assigns.fetch(:type) - type = local_assigns.fetch(:type)
%aside.issues-bulk-update.js-right-sidebar.right-sidebar{ 'aria-live' => 'polite', data: { 'signed-in': current_user.present? } } %aside.issues-bulk-update.js-right-sidebar.right-sidebar{ 'aria-live' => 'polite', data: { 'signed-in': current_user.present? } }
.issuable-sidebar.hidden .issuable-sidebar.hidden
= form_tag [:bulk_update, @group, type], method: :post, class: "bulk-update" do = form_tag [:bulk_update, group, type], method: :post, class: "bulk-update" do
.block.issuable-sidebar-header .block.issuable-sidebar-header
.filter-item.inline.update-issues-btn.float-left .filter-item.inline.update-issues-btn.float-left
= button_tag _('Update all'), class: "btn update-selected-issues btn-info", disabled: true = button_tag _('Update all'), class: "btn update-selected-issues btn-info", disabled: true
......
...@@ -31,7 +31,7 @@ describe Issuable::BulkUpdateService do ...@@ -31,7 +31,7 @@ describe Issuable::BulkUpdateService do
end end
end end
context 'when parent is a project' do context 'with project issues' do
describe 'close issues' do describe 'close issues' do
let(:issues) { create_list(:issue, 2, project: project) } let(:issues) { create_list(:issue, 2, project: project) }
...@@ -360,7 +360,7 @@ describe Issuable::BulkUpdateService do ...@@ -360,7 +360,7 @@ describe Issuable::BulkUpdateService do
end end
end end
context 'when parent is a group' do context 'with group issues' do
let(:group) { create(:group) } let(:group) { create(:group) }
context 'updating milestone' do context 'updating milestone' do
......
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