Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
gem 'gruff'
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Redmine Plugin: Advanced Roadmap v2
Redmine Plugin: Advanced Roadmap v2 (for redmine 4.+)
===========================

This plugin was a fork of Redmine Plugin: [advanced roadmap](https://redmine.ociotec.com/projects/advanced-roadmap), when it was not developed.
Expand Down
15 changes: 10 additions & 5 deletions app/controllers/milestones_controller.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
require "advanced_roadmap/gruff/pie" if Object.const_defined?(:Magick)
require 'gruff/pie' if Object.const_defined?(:Magick)

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
Expand Down Expand Up @@ -100,7 +100,7 @@ def destroy
end

def total_graph
g = AdvancedRoadmap::Gruff::Pie.new(params[:size] || "500x400")
g = Gruff::Pie.new(params[:size] || "500x400")
g.hide_title = true
g.theme = graph_theme
g.margins = 0
Expand All @@ -120,6 +120,11 @@ def total_graph

private

def milestone_params
params.require(:milestone).permit(:name, :description, :effective_date)
end


def find_project
@project = Project.find(params[:project_id])
rescue ActiveRecord::RecordNotFound
Expand Down
4 changes: 2 additions & 2 deletions app/models/milestone.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ class Milestone < ActiveRecord::Base
validates_uniqueness_of :name, :scope => [:project_id]
validates_length_of :name, :maximum => 60
validates :effective_date, :date => true, :allow_nil => true

attr_accessible :name, :description, :effective_date
# TODO: Fix this later. Not for Rails 5.2
#attr_accessible :name, :description, :effective_date

def to_s
name
Expand Down
2 changes: 1 addition & 1 deletion app/views/versions/_total.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<%= 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 => '40em', :legend => ('%0.0f%%' % totals[:completed_percent])) %>
<fieldset><legend><%= l(:label_time_tracking) %></legend>
<table width="100%">
<tr>
Expand Down
2 changes: 1 addition & 1 deletion app/views/versions/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@

<% html_title(l(:label_roadmap)) %>

<%= context_menu issues_context_menu_path %>
<%= context_menu %>
2 changes: 1 addition & 1 deletion app/views/versions/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@

<% html_title @version.name %>

<%= context_menu issues_context_menu_path %>
<%= context_menu %>
2 changes: 1 addition & 1 deletion db/migrate/001_create_milestones.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateMilestones < ActiveRecord::Migration
class CreateMilestones < ActiveRecord::Migration[5.2]
def self.up
create_table :milestones, :force => true do |t|
t.column :name, :string, :null => false
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/002_create_milestone_versions.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CreateMilestoneVersions < ActiveRecord::Migration
class CreateMilestoneVersions < ActiveRecord::Migration[5.2]
def self.up
create_table :milestone_versions, :force => true do |t|
t.column :milestone_id, :integer, :null => false
Expand Down
2 changes: 1 addition & 1 deletion db/migrate/003_preset_permissions.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class PresetPermissions < ActiveRecord::Migration
class PresetPermissions < ActiveRecord::Migration[5.2]
def self.up
role = nil
begin
Expand Down
2 changes: 1 addition & 1 deletion lib/advanced_roadmap/calendars_controller_patch.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module CalendarsControllerPatch
def self.included(base)
base.class_eval do

around_filter :add_milestones, :only => [:show]
around_action :add_milestones, :only => [:show]

def add_milestones
yield
Expand Down
28 changes: 0 additions & 28 deletions lib/advanced_roadmap/gruff.rb

This file was deleted.

27 changes: 0 additions & 27 deletions lib/advanced_roadmap/gruff/accumulator_bar.rb

This file was deleted.

58 changes: 0 additions & 58 deletions lib/advanced_roadmap/gruff/area.rb

This file was deleted.

87 changes: 0 additions & 87 deletions lib/advanced_roadmap/gruff/bar.rb

This file was deleted.

46 changes: 0 additions & 46 deletions lib/advanced_roadmap/gruff/bar_conversion.rb

This file was deleted.

Loading