aas/additionals
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix dashboard name in sidebar

Browse Source
This commit is contained in:
Alexander Meindl 2020-09-06 17:31:10 +02:00
parent ed9e68a72c
commit 8aa14af0a8
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/dashboards_helper.rb
View File

@ -86,7 +86,7 @@ module DashboardsHelper
tag.div class: 'active-dashboards' do
out = [tag.h3(l(:label_active_dashboard)),
tag.ul do
concat tag.ul "#{l :field_name}: #{h dashboard.name}"
concat tag.ul "#{l :field_name}: #{dashboard.name}"
concat tag.ul safe_join([l(:field_author), link_to_user(dashboard.author)], ': ')
concat tag.ul "#{l :field_created_on}: #{format_time dashboard.created_at}"
concat tag.ul "#{l :field_updated_on}: #{format_time dashboard.updated_at}"

8
app/views/projects/show.html.slim
View File

@ -52,7 +52,7 @@
- unless @dashboard_sidebar
= render_dashboard_actionlist @dashboard, @project
= call_hook :view_projects_show_actions_dropdown, project: @project
= call_hook :view_project_actions_dropdown, project: @project
- if User.current.allowed_to?(:edit_project, @project)
= link_to_if_authorized l(:label_settings),
@ -77,7 +77,13 @@ javascript:
- if @dashboard_sidebar
- content_for :sidebar do
= call_hook :view_projects_show_sidebar_top, project: @project
= render_sidebar_dashboards @dashboard, @project
- if Additionals.setting(:global_sidebar).present?
br
.sidebar-additionals
= textilizable Additionals.setting(:global_sidebar)
= call_hook :view_projects_show_sidebar_bottom, project: @project
- content_for :header_tags do

29
lib/additionals/hooks.rb
View File

@ -3,22 +3,21 @@ module Additionals
include IssuesHelper
include AdditionalsIssuesHelper
render_on(:view_layouts_base_html_head, partial: 'additionals/html_head')
render_on(:view_layouts_base_body_top, partial: 'additionals/body_top')
render_on(:view_layouts_base_body_bottom, partial: 'additionals/body_bottom')
render_on :view_layouts_base_html_head, partial: 'additionals/html_head'
render_on :view_layouts_base_body_top, partial: 'additionals/body_top'
render_on :view_layouts_base_body_bottom, partial: 'additionals/body_bottom'
render_on(:view_account_login_bottom, partial: 'login_text')
render_on(:view_issues_context_menu_start, partial: 'additionals_closed_issues')
render_on(:view_issues_bulk_edit_details_bottom, partial: 'change_author_bulk')
render_on(:view_issues_form_details_bottom, partial: 'change_author')
render_on(:view_issues_new_top, partial: 'new_ticket_message')
render_on(:view_issues_sidebar_issues_bottom, partial: 'issues/additionals_sidebar_issues')
render_on(:view_issues_sidebar_queries_bottom, partial: 'issues/additionals_sidebar_queries')
render_on(:view_projects_show_sidebar_bottom, partial: 'projects/additionals_sidebar')
render_on(:view_my_account_preferences, partial: 'users/autowatch_involved_issue')
render_on(:view_users_form_preferences, partial: 'users/autowatch_involved_issue')
render_on(:view_users_show_contextual, partial: 'users/additionals_contextual')
render_on(:view_wiki_show_sidebar_bottom, partial: 'additionals_sidebar')
render_on :view_account_login_bottom, partial: 'login_text'
render_on :view_issues_context_menu_start, partial: 'additionals_closed_issues'
render_on :view_issues_bulk_edit_details_bottom, partial: 'change_author_bulk'
render_on :view_issues_form_details_bottom, partial: 'change_author'
render_on :view_issues_new_top, partial: 'new_ticket_message'
render_on :view_issues_sidebar_issues_bottom, partial: 'issues/additionals_sidebar_issues'
render_on :view_issues_sidebar_queries_bottom, partial: 'issues/additionals_sidebar_queries'
render_on :view_my_account_preferences, partial: 'users/autowatch_involved_issue'
render_on :view_users_form_preferences, partial: 'users/autowatch_involved_issue'
render_on :view_users_show_contextual, partial: 'users/additionals_contextual'
render_on :view_wiki_show_sidebar_bottom, partial: 'additionals_sidebar'
def helper_issues_show_detail_after_setting(context = {})
detail = context[:detail]