Skip to content
Snippets Groups Projects
Commit d5157061 authored by milan.brabec's avatar milan.brabec
Browse files

oprava zobrazení v projektech bez sparkline

parent bd3d99fb
No related branches found
No related tags found
No related merge requests found
<% if @issues.any? { |issue| issue.project.enabled_module(:sparkline) } %>
<% content_for :header_tags do %> <% content_for :header_tags do %>
<%= javascript_include_tag 'jquery.sparkline', plugin: 'sparkline' %> <%= javascript_include_tag 'jquery.sparkline', plugin: 'sparkline' %>
<%= javascript_include_tag 'sparkline', plugin: 'sparkline' %> <%= javascript_include_tag 'sparkline', plugin: 'sparkline' %>
<%= stylesheet_link_tag 'sparkline', plugin: 'sparkline' %> <%= stylesheet_link_tag 'sparkline', plugin: 'sparkline' %>
<% end %>
<% end %> <% end %>
:root {
--sparkline-edge: hsl(0deg 0% 90%);
}
table.progress + .percent {
float: left;
/*margin-right: 5px;*/
}
.done_ratio_sparkline_container {
padding-right: 2px;
}
.done_ratio_sparkline > canvas {
width: 150px;
margin: 0 5px;
border-inline: 1px solid var(--sparkline-edge);
padding-inline: 1px;
}
...@@ -3,8 +3,8 @@ Redmine::Plugin.register :sparkline do ...@@ -3,8 +3,8 @@ Redmine::Plugin.register :sparkline do
author 'Sperling' author 'Sperling'
description 'Sparkline plugin for done ratio of issues' description 'Sparkline plugin for done ratio of issues'
version '1.0.0' version '1.0.0'
url '' url 'https://www.sperling.cz/redmine'
author_url 'https://www.sperling.cz/' author_url 'https://www.sperling.cz/redmine'
require_dependency 'sparkline_hook_listener' require_dependency 'sparkline_hook_listener'
...@@ -16,8 +16,9 @@ Redmine::Plugin.register :sparkline do ...@@ -16,8 +16,9 @@ Redmine::Plugin.register :sparkline do
line_color: "blue", line_color: "blue",
fill_color: "skyblue", fill_color: "skyblue",
}, partial: 'settings/sparkline/sparkline' }, partial: 'settings/sparkline/sparkline'
permission :sparkline, { permission :sparkline, {
settings: [ :plugin ] # settings: [ :plugin ]
} }
end end
end end
...@@ -56,7 +56,7 @@ class IssueSparkline ...@@ -56,7 +56,7 @@ class IssueSparkline
@values.sort.to_h.each {|key, value| string_values.append "#{key.to_time.to_i}:#{value}" } @values.sort.to_h.each {|key, value| string_values.append "#{key.to_time.to_i}:#{value}" }
content_tag(tag, content_tag(tag,
"", "",
values: string_values.join(","), values: @issue.project.enabled_module(:sparkline) ? string_values.join(",") : "",
class: 'done_ratio_sparkline', class: 'done_ratio_sparkline',
issueId: @issue.id, issueId: @issue.id,
sparkType: 'line', sparkType: 'line',
......
...@@ -39,7 +39,9 @@ module ProjectsHelperPatch ...@@ -39,7 +39,9 @@ module ProjectsHelperPatch
module InstanceMethods module InstanceMethods
def project_settings_tabs_with_sparkline def project_settings_tabs_with_sparkline
tabs = project_settings_tabs_without_sparkline tabs = project_settings_tabs_without_sparkline
tabs.push ( {:name => 'sparkline', :action => :sparkline, :partial => 'settings/plugin_sparkline', :label => :sparkline}) if @project.enabled_module(:sparkline)
tabs.push ( {:name => 'sparkline', :action => :sparkline, :partial => 'settings/plugin_sparkline', :label => :sparkline})
end
tabs tabs
end end
end end
......
...@@ -8,7 +8,8 @@ module SettingsControllerPatch ...@@ -8,7 +8,8 @@ module SettingsControllerPatch
base.class_eval do base.class_eval do
unloadable # Send unloadable so it will not be unloaded in development , :authorize unloadable # Send unloadable so it will not be unloaded in development , :authorize
before_action :find_project, :authorize, :only => [:plugin], unless: -> { params[:project_id].blank? } # before_action :find_project, :authorize, :only => [:plugin], unless: -> { params[:project_id].blank? }
before_action :find_project, :only => [:plugin], unless: -> { params[:project_id].blank? }
alias_method :old_plugin, :plugin alias_method :old_plugin, :plugin
alias_method :plugin, :new_plugin alias_method :plugin, :new_plugin
...@@ -20,6 +21,7 @@ module SettingsControllerPatch ...@@ -20,6 +21,7 @@ module SettingsControllerPatch
module InstanceMethods module InstanceMethods
def new_plugin def new_plugin
# unless
unless params[:id] == :sparkline unless params[:id] == :sparkline
return old_plugin return old_plugin
end end
...@@ -52,6 +54,7 @@ module SettingsControllerPatch ...@@ -52,6 +54,7 @@ module SettingsControllerPatch
def find_project def find_project
# @project variable must be set before calling the authorize filter # @project variable must be set before calling the authorize filter
@project = Project.find(params[:project_id]) unless params[:project_id].blank? @project = Project.find(params[:project_id]) unless params[:project_id].blank?
params[:id] = :sparkline
end end
end end
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment