Redmine 5.x

app/controllers/milestones_controller.rb

@@ -2,9 +2,9 @@
 
 class MilestonesController < ApplicationController
   menu_item :roadmap
-  before_filter :find_project, :only => [:new, :create]
-  before_filter :find_milestone, :only => [:show, :edit, :update, :destroy]
-  before_filter :authorize, :except => [:show, :total_graph]
+  before_action :find_project, :only => [:new, :create]
+  before_action :find_milestone, :only => [:show, :edit, :update, :destroy]
+  before_action :authorize, :except => [:show, :total_graph]
 
   helper :custom_fields
   helper :projects
@@ -37,7 +37,7 @@ def new
   end
 
   def create
-    @milestone = @project.milestones.build(params[:milestone])
+    @milestone = @project.milestones.build(milestone_params)
     @milestone.user_id = User.current.id
     if request.post? and @milestone.save
       if params[:versions]
@@ -75,7 +75,7 @@ def update
         end
       end
     end
-    if @milestone.update_attributes(params[:milestone])
+    if @milestone.update(milestone_params)
       versions_to_delete.each do |version|
         milestone_version = MilestoneVersion.where("milestone_id = #{@milestone.id} AND version_id = #{version.id}").first
         milestone_version.destroy
@@ -100,7 +100,7 @@ def destroy
   end
 
   def total_graph
-    g = AdvancedRoadmap::Gruff::Pie.new(params[:size] || "500x400")
+    g = RedmineAdvancedRoadmap::Gruff::Pie.new(params[:size] || "500x400")
     g.hide_title = true
     g.theme = graph_theme
     g.margins = 0
@@ -149,4 +149,8 @@ def retrieve_selected_tracker_ids(selectable_trackers, default_trackers=nil)
     end
   end
 
+  def milestone_params
+    params.require(:milestone).permit(:name, :description, :effective_date)
+  end
+
 end

app/models/milestone.rb

@@ -10,8 +10,6 @@ class Milestone < ActiveRecord::Base
   validates_length_of :name, :maximum => 60
   validates :effective_date, :date => true, :allow_nil => true
 
-  attr_accessible :name, :description, :effective_date
-
   def to_s
     name
   end

app/views/hooks/_stylesheet.html.erb

@@ -1 +1 @@
-<%= stylesheet_link_tag("advanced_roadmap", :plugin => "advanced_roadmap_v2", :media => "all") %>
+<%= stylesheet_link_tag("redmine_advanced_roadmap", :plugin => "redmine_advanced_roadmap_v2", :media => "all") %>

app/views/settings/_advanced_roadmap_settings.html.erb

@@ -1,4 +1,4 @@
-<%- defaults = Redmine::Plugin::registered_plugins[:advanced_roadmap_v2].settings[:default] -%>
+<%- defaults = Redmine::Plugin::registered_plugins[:redmine_advanced_roadmap_v2].settings[:default] -%>
 
 <p>
   <%= label_tag 'settings[show_due_time]', l(:label_setting_show_due_time) %>

app/views/versions/_info.html.erb

@@ -50,7 +50,7 @@
 <%- end -%>
 
 <%- if issues.present? -%>
-<%- show_due_time = (Setting.plugin_advanced_roadmap_v2["show_due_time"]) -%>
+<%- show_due_time = (Setting.plugin_redmine_advanced_roadmap_v2["show_due_time"]) -%>
 <fieldset class="related-issues"><legend><%= l(:label_related_issues) %></legend>
 <%= form_tag({}) do %>
 <table class="list related-issues">

app/views/versions/_total.html.erb

@@ -1,6 +1,7 @@
 <%= tag "a", :name => l(:label_total) %>
 <h3 class="icon22 icon22-package"><%= l(:label_total) %></h3>
-<%= progress_bar([totals[:closed_percent], totals[:completed_percent]], :width => '40em', :legend => ('%0.0f%' % totals[:completed_percent])) %>
+<%= progress_bar([totals[:closed_percent], totals[:completed_percent]], :width => '80px', :legend => ('%0.0f%%' % totals[:completed_percent])) %>
+<br>
 <fieldset><legend><%= l(:label_time_tracking) %></legend>
   <table width="100%">
     <tr>
@@ -47,3 +48,4 @@
     </tr>
   </table>
 </fieldset>
+<br>

db/migrate/001_create_milestones.rb

@@ -1,4 +1,4 @@
-class CreateMilestones < ActiveRecord::Migration
+class CreateMilestones < ActiveRecord::Migration[5.1]
   def self.up
     create_table :milestones, :force => true do |t|
       t.column :name,             :string,                            :null => false

db/migrate/002_create_milestone_versions.rb

@@ -1,4 +1,4 @@
-class CreateMilestoneVersions < ActiveRecord::Migration
+class CreateMilestoneVersions < ActiveRecord::Migration[5.1]
   def self.up
     create_table :milestone_versions, :force => true do |t|
       t.column :milestone_id,     :integer,                           :null => false

db/migrate/003_preset_permissions.rb

@@ -1,4 +1,4 @@
-class PresetPermissions < ActiveRecord::Migration
+class PresetPermissions < ActiveRecord::Migration[5.1]
   def self.up
     role = nil
     begin

init.rb

@@ -5,31 +5,25 @@
   ActiveSupport::Dependencies.autoload_once_paths.reject!{|x| x =~ /^#{Regexp.escape(File.dirname(__FILE__))}/}
 end
 
-require "redmine"
-require "rubygems"
-require "gravatar"
+ApplicationHelper.send(:include, RedmineAdvancedRoadmap::ApplicationHelperPatch)
+CalendarsController.send(:include, RedmineAdvancedRoadmap::CalendarsControllerPatch)
+Issue.send(:include, RedmineAdvancedRoadmap::IssuePatch)
+Journal.send(:include, RedmineAdvancedRoadmap::JournalPatch)
+Project.send(:include, RedmineAdvancedRoadmap::ProjectPatch)
+ProjectsHelper.send(:include, RedmineAdvancedRoadmap::ProjectsHelperPatch)
+Query.send(:include, RedmineAdvancedRoadmap::QueryPatch)
+Redmine::Helpers::Gantt.send(:include, RedmineAdvancedRoadmap::RedmineHelpersGanttPatch)
+Redmine::I18n.send(:include, RedmineAdvancedRoadmap::RedmineI18nPatch)
+Version.send(:include, RedmineAdvancedRoadmap::VersionPatch)
+VersionsController.send(:include, RedmineAdvancedRoadmap::VersionsControllerPatch)
 
-ApplicationHelper.send(:include, AdvancedRoadmap::ApplicationHelperPatch)
-CalendarsController.send(:include, AdvancedRoadmap::CalendarsControllerPatch)
-Issue.send(:include, AdvancedRoadmap::IssuePatch)
-Journal.send(:include, AdvancedRoadmap::JournalPatch)
-Project.send(:include, AdvancedRoadmap::ProjectPatch)
-ProjectsHelper.send(:include, AdvancedRoadmap::ProjectsHelperPatch)
-Query.send(:include, AdvancedRoadmap::QueryPatch)
-Redmine::Helpers::Gantt.send(:include, AdvancedRoadmap::RedmineHelpersGanttPatch)
-Redmine::I18n.send(:include, AdvancedRoadmap::RedmineI18nPatch)
-Version.send(:include, AdvancedRoadmap::VersionPatch)
-VersionsController.send(:include, AdvancedRoadmap::VersionsControllerPatch)
-
-require_dependency "advanced_roadmap/view_hooks"
-
-Redmine::Plugin.register :advanced_roadmap_v2 do
+Redmine::Plugin.register :redmine_advanced_roadmap_v2 do
   name "Advanced roadmap & milestones plugin"
   url "https://github.com/ekylibre/redmine_advanced_roadmap_v2"
   author "Michel LOISELEUR"
   author_url "https://github.com/Coren"
   description "This is a plugin for Redmine that is used to show more information inside the Roadmap page and implements the milestones featuring."
-  version "2.4.3"
+  version "2.5.0"
   permission :manage_milestones, {:milestones => [:new, :create, :edit, :update, :destroy]}
   requires_redmine :version_or_higher => "2.1.2"
 

lib/advanced_roadmap/application_helper_patch.rb → lib/redmine_advanced_roadmap/application_helper_patch.rb

@@ -1,6 +1,6 @@
 require_dependency "application_helper"
 
-module AdvancedRoadmap
+module RedmineAdvancedRoadmap
   module ApplicationHelperPatch
     def self.included(base)
       base.class_eval do
@@ -15,9 +15,9 @@ def link_to_milestone(milestone)
 
         def color_by_ratio(ratio)
           color = ""
-          color = Setting.plugin_advanced_roadmap_v2["color_good"] if ratio <= Setting.plugin_advanced_roadmap_v2["ratio_good"].to_f
-          color = Setting.plugin_advanced_roadmap_v2["color_bad"] if ratio >= Setting.plugin_advanced_roadmap_v2["ratio_bad"].to_f
-          color = Setting.plugin_advanced_roadmap_v2["color_very_bad"] if ratio >= Setting.plugin_advanced_roadmap_v2["ratio_very_bad"].to_f
+          color = Setting.plugin_redmine_advanced_roadmap_v2["color_good"] if ratio <= Setting.plugin_redmine_advanced_roadmap_v2["ratio_good"].to_f
+          color = Setting.plugin_redmine_advanced_roadmap_v2["color_bad"] if ratio >= Setting.plugin_redmine_advanced_roadmap_v2["ratio_bad"].to_f
+          color = Setting.plugin_redmine_advanced_roadmap_v2["color_very_bad"] if ratio >= Setting.plugin_redmine_advanced_roadmap_v2["ratio_very_bad"].to_f
           return(color)
         end