consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes admin menu link when create a new widget

Browse Source
This commit is contained in:
decabeza
2018-11-08 12:53:33 +01:00
parent 06969e0ec7
commit 13b3d9cebc
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/helpers/admin_helper.rb
View File

@@ -9,12 +9,8 @@ module AdminHelper
end end
def namespaced_root_path def namespaced_root_path
if namespace == 'moderation/budgets'
"/moderation"
else
"/#{namespace}" "/#{namespace}"
end end
end
def namespaced_header_title def namespaced_header_title
if namespace == 'moderation/budgets' if namespace == 'moderation/budgets'
@@ -95,7 +91,7 @@ module AdminHelper
private private
def namespace def namespace
controller.class.parent.name.downcase.gsub("::", "/") controller.class.name.downcase.split("::").first
end end
end end

4
app/helpers/budgets_helper.rb
View File

@@ -27,7 +27,7 @@ module BudgetsHelper
def namespaced_budget_investment_path(investment, options = {}) def namespaced_budget_investment_path(investment, options = {})
case namespace case namespace
when "management/budgets" when "management"
management_budget_investment_path(investment.budget, investment, options) management_budget_investment_path(investment.budget, investment, options)
else else
budget_investment_path(investment.budget, investment, options) budget_investment_path(investment.budget, investment, options)
@@ -36,7 +36,7 @@ module BudgetsHelper
def namespaced_budget_investment_vote_path(investment, options = {}) def namespaced_budget_investment_vote_path(investment, options = {})
case namespace case namespace
when "management/budgets" when "management"
vote_management_budget_investment_path(investment.budget, investment, options) vote_management_budget_investment_path(investment.budget, investment, options)
else else
vote_budget_investment_path(investment.budget, investment, options) vote_budget_investment_path(investment.budget, investment, options)

11
spec/features/admin/homepage/homepage_spec.rb
View File

@@ -19,7 +19,16 @@ feature 'Homepage' do
let(:user_recommendations) { Setting.where(key: 'feature.user.recommendations').first } let(:user_recommendations) { Setting.where(key: 'feature.user.recommendations').first }
let(:user) { create(:user) } let(:user) { create(:user) }
scenario "Header" do context "Header" do
scenario "Admin menu links to homepage path" do
visit new_admin_widget_card_path(header_card: true)
click_link Setting['org_name'] + " Administration"
expect(page).to have_current_path(admin_root_path)
end
end end
context "Feeds" do context "Feeds" do