Merge branch 'master' into dashboard

This commit is contained in:
decabeza
2019-03-26 16:45:48 +01:00
2476 changed files with 62613 additions and 84405 deletions

View File

@@ -1,7 +1,7 @@
module AdminHelper
def side_menu
if namespace == 'moderation/budgets'
if namespace == "moderation/budgets"
render "/moderation/menu"
else
render "/#{namespace}/menu"
@@ -9,15 +9,11 @@ module AdminHelper
end
def namespaced_root_path
if namespace == 'moderation/budgets'
"/moderation"
else
"/#{namespace}"
end
"/#{namespace}"
end
def namespaced_header_title
if namespace == 'moderation/budgets'
if namespace == "moderation/budgets"
t("moderation.header.title")
else
t("#{namespace}.header.title")
@@ -25,7 +21,16 @@ module AdminHelper
end
def menu_moderated_content?
["proposals", "debates", "comments", "hidden_users", "activity", "hidden_budget_investments"].include?(controller_name) && controller.class.parent != Admin::Legislation
moderated_sections.include?(controller_name) && controller.class.parent != Admin::Legislation
end
def moderated_sections
["hidden_proposals", "debates", "comments", "hidden_users", "activity",
"hidden_budget_investments"]
end
def menu_budgets?
controller_name.starts_with?("budget")
end
def menu_budget?
@@ -33,7 +38,8 @@ module AdminHelper
end
def menu_polls?
%w[polls questions answers recounts results].include?(controller_name)
%w[polls active_polls recounts results questions answers].include?(controller_name) ||
controller.class.parent == Admin::Poll::Questions::Answers
end
def menu_booths?
@@ -45,15 +51,21 @@ module AdminHelper
end
def menu_settings?
["settings", "tags", "geozones", "images", "content_blocks"].include?(controller_name)
["settings", "tags", "geozones", "images", "content_blocks"].include?(controller_name) &&
controller.class.parent != Admin::Poll::Questions::Answers
end
def menu_customization?
["pages", "banners", "information_texts"].include?(controller_name) || menu_homepage?
["pages", "banners", "information_texts"].include?(controller_name) ||
menu_homepage? || menu_pages?
end
def menu_homepage?
["homepage", "cards"].include?(controller_name)
["homepage", "cards"].include?(controller_name) && params[:page_id].nil?
end
def menu_pages?
["pages", "cards"].include?(controller_name) && params[:page_id].present?
end
def menu_dashboard?
@@ -63,13 +75,13 @@ module AdminHelper
def official_level_options
options = [["", 0]]
(1..5).each do |i|
options << [[t("admin.officials.level_#{i}"), setting["official_level_#{i}_name"]].compact.join(': '), i]
options << [[t("admin.officials.level_#{i}"), setting["official_level_#{i}_name"]].compact.join(": "), i]
end
options
end
def admin_select_options
Administrator.all.order('users.username asc').includes(:user).collect { |v| [ v.name, v.id ] }
Administrator.all.order("users.username asc").includes(:user).collect { |v| [ v.name, v.id ] }
end
def admin_submit_action(resource)
@@ -92,14 +104,10 @@ module AdminHelper
user_roles(user).join(", ")
end
def display_budget_goup_form(group)
group.errors.messages.size > 0 ? "" : "display:none"
end
private
def namespace
controller.class.parent.name.downcase.gsub("::", "/")
controller.class.name.downcase.split("::").first
end
end