Merge pull request #46 from onozaty/develp/2.4.0

Development for 2.4.0

Author: onozaty

app/controllers/view_customizes_controller.rb

@@ -2,7 +2,7 @@ class ViewCustomizesController < ApplicationController
   layout 'admin'
 
   before_action :require_admin
-  before_action :find_view_customize, :except => [:index, :new, :create]
+  before_action :find_view_customize, :except => [:index, :new, :create, :update_all]
 
   helper :sort
   include SortHelper
@@ -47,6 +47,13 @@ def update
     render :action => 'edit'
   end
 
+  def update_all
+    ViewCustomize.update_all(view_customize_params.to_hash)
+
+    flash[:notice] = l(:notice_successful_update)
+    redirect_to view_customizes_path
+  end
+
   def destroy
     @view_customize.destroy
     redirect_to view_customizes_path

app/views/view_customizes/index.html.erb

@@ -37,4 +37,14 @@
 
 </table>
 
+<p class="buttons">
+  <%= link_to l(:label_disable_all),
+      view_customizes_path(view_customize: {is_enabled: 0}),
+      :data => {:confirm => l(:text_are_you_sure)}, :method => :put,
+      :class => 'icon icon-view_customize-disable' %>
+  <%= link_to l(:label_enable_all),
+      view_customizes_path(view_customize: {is_enabled: 1}),
+      :data => {:confirm => l(:text_are_you_sure)}, :method => :put,
+      :class => 'icon icon-view_customize-enable' %>
+</p>
 <% end %>

assets/images/disable.png

@@ -61,3 +61,11 @@ input#view_customize_comments {
 .icon-view_customize {
     background-image: url("../images/view_customize.png");
 }
+
+.icon-view_customize-disable {
+    background-image: url("../images/disable.png");
+}
+
+.icon-view_customize-enable {
+    background-image: url("../images/enable.png");
+}

assets/images/enable.png

@@ -3,6 +3,8 @@ en:
   label_view_customize: "View customize"
   label_view_customize_plural: "View customizes"
   label_view_customizes_new: "New view customize"
+  label_disable_all: "Disable all"
+  label_enable_all: "Enable all"
   label_javascript: "JavaScript"
   label_css: "CSS"
   label_html: "HTML"

assets/stylesheets/view_customize.css

@@ -2,10 +2,12 @@ ja:
   label_view_customize: "表示のカスタマイズ"
   label_view_customize_plural: "表示のカスタマイズ"
   label_view_customizes_new: "新しい表示のカスタマイズ"
+  label_disable_all: "すべて無効に"
+  label_enable_all: "すべて有効に"
   label_javascript: "JavaScript"
   label_css: "CSS"
   label_html: "HTML"
-  label_insertion_position_html_head: "全てのページのヘッダ"
+  label_insertion_position_html_head: "全ページのヘッダ"
   label_insertion_position_issue_form: "チケット入力欄の下"
   label_insertion_position_issue_show: "チケット詳細の下"
   field_path_pattern: "パスのパターン"

config/locales/en.yml

@@ -2,4 +2,5 @@
 # See: http://guides.rubyonrails.org/routing.html
 Rails.application.routes.draw do
   resources :view_customizes
+  put :view_customizes, to: 'view_customizes#update_all'
 end

config/locales/ja.yml

@@ -3,7 +3,7 @@
   name 'View Customize plugin'
   author 'onozaty'
   description 'View Customize plugin for Redmine'
-  version '2.3.0'
+  version '2.4.0'
   url 'https://github.com/onozaty/redmine-view-customize'
   author_url 'https://github.com/onozaty'
 

config/routes.rb

@@ -2,7 +2,7 @@ module RedmineViewCustomize
   class ViewHook < Redmine::Hook::ViewListener
     def view_layouts_base_html_head(context={})
 
-      path = context[:request].path_info;
+      path = Redmine::CodesetUtil.replace_invalid_utf8(context[:request].path_info);
 
       html = "\n<!-- [view customize plugin] path:#{path} -->\n"
       html << stylesheet_link_tag("view_customize", plugin: "view_customize")
@@ -17,7 +17,8 @@ def view_layouts_base_html_head(context={})
 
     def view_issues_form_details_bottom(context={})
 
-      return create_view_customize_html(context[:request].path_info, ViewCustomize::INSERTION_POSITION_ISSUE_FORM)
+      path = Redmine::CodesetUtil.replace_invalid_utf8(context[:request].path_info);
+      return create_view_customize_html(path, ViewCustomize::INSERTION_POSITION_ISSUE_FORM)
     end
 
     def view_issues_show_details_bottom(context={})
@@ -26,7 +27,8 @@ def view_issues_show_details_bottom(context={})
       html << "ViewCustomize.context.issue = { id: #{context[:issue].id} };"
       html << "\n//]]>\n</script>"
 
-      html << create_view_customize_html(context[:request].path_info, ViewCustomize::INSERTION_POSITION_ISSUE_SHOW)
+      path = Redmine::CodesetUtil.replace_invalid_utf8(context[:request].path_info);
+      html << create_view_customize_html(path, ViewCustomize::INSERTION_POSITION_ISSUE_SHOW)
 
       return html
     end