various fixes up to redmine 3.4 for those interested

.travis.yml

@@ -1,34 +1,20 @@
 ---
 language: ruby
 release: 1.0.6
+sudo: false
 services:
 - mysql
 - postgresql
 rvm:
-- 1.9.3
 - 2.0.0
 env:
-- REDMINE_VER=2.2.4 DB=mysql CLUSTER=CLUSTER1
-- REDMINE_VER=2.2.4 DB=mysql CLUSTER=CLUSTER2
-- REDMINE_VER=2.2.4 DB=postgresql CLUSTER=CLUSTER1
-- REDMINE_VER=2.2.4 DB=postgresql CLUSTER=CLUSTER2
-- REDMINE_VER=2.3.3 DB=postgresql CLUSTER=CLUSTER1
-- REDMINE_VER=2.3.3 DB=postgresql CLUSTER=CLUSTER2
-- REDMINE_VER=2.5.1 DB=postgresql CLUSTER=CLUSTER1
-- REDMINE_VER=2.5.1 DB=postgresql CLUSTER=CLUSTER2
+- REDMINE_VER=3.0.3 DB=postgresql CLUSTER=CLUSTER1
+- REDMINE_VER=3.0.3 DB=postgresql CLUSTER=CLUSTER2
+- REDMINE_VER=3.0.3 DB=mysql CLUSTER=CLUSTER1
+- REDMINE_VER=3.0.3 DB=mysql CLUSTER=CLUSTER2
 matrix:
   allow_failures:
-  - rvm: jruby-18mode
-  - rvm: jruby-19mode
   exclude:
-  - rvm: 2.0.0
-    env: REDMINE_VER=2.2.4 DB=mysql CLUSTER=CLUSTER1
-  - rvm: 2.0.0
-    env: REDMINE_VER=2.2.4 DB=mysql CLUSTER=CLUSTER2
-  - rvm: 2.0.0
-    env: REDMINE_VER=2.2.4 DB=postgresql CLUSTER=CLUSTER1
-  - rvm: 2.0.0
-    env: REDMINE_VER=2.2.4 DB=postgresql CLUSTER=CLUSTER2
 install: echo skip bundle install
 before_script:
 - sh -c "if [ '$DB' = 'postgresql' ]; then psql -c 'DROP DATABASE IF EXISTS backlogs;'

Gemfile

@@ -1,85 +1,8 @@
-source 'https://rubygems.org'
-
-redmine_version_file = File.expand_path("../../../lib/redmine/version.rb",__FILE__)
-if (!File.exists? redmine_version_file)
-  redmine_version_file = File.expand_path("lib/redmine/version.rb");
-end
-version_file = IO.read(redmine_version_file)
-redmine_version_minor = version_file.match(/MINOR =/).post_match.match(/\d/)[0].to_i
-redmine_version_major = version_file.match(/MAJOR =/).post_match.match(/\d/)[0].to_i
-
-chiliproject_file = File.dirname(__FILE__) + "/lib/chili_project.rb"
-chiliproject = File.file?(chiliproject_file)
-
-deps = Hash.new
-@dependencies.map{|dep| deps[dep.name] = dep }
-rails3 = Gem::Dependency.new('rails', '~>3.0')
-RAILS_VERSION_IS_3 = rails3 =~ deps['rails']
-
+gem "sidekiq"
+gem 'erubis', '~> 2.7'
 gem "holidays", "~>1.0.3"
 gem "icalendar"
-# Choose nokogiri depending on RM version. This is done to avoid conflict with
-# RM 2.3 which pinned nokogiri at "<1.6.0" for group :test.
-if (redmine_version_major == 2 && redmine_version_minor == 3)
-gem "nokogiri", "< 1.6.0"
-else
-gem "nokogiri"
-end
 gem "open-uri-cached"
 gem "prawn"
 gem 'json'
-gem "system_timer" if RUBY_VERSION =~ /^1\.8\./ && RUBY_PLATFORM =~ /darwin|linux/
-
-group :development do
-  gem "inifile"
-end
-
-group :test do
-  gem 'chronic'
-  gem 'ZenTest', "=4.5.0" # 4.6.0 has a nasty bug that breaks autotest
-  gem 'autotest-rails'
-  if RAILS_VERSION_IS_3
-    unless chiliproject
-      gem 'capybara', "~> 1.1" if ENV['IN_RBL_TESTENV'] == 'true' # redmine 2.3 conflicts
-      gem "faye-websocket", "~>0.4.7"
-      gem "poltergeist", "~>1.0"
-    end
-    gem 'cucumber-rails', :require => false
-    gem "culerity"
-  else
-    unless chiliproject
-      gem "capybara", "~>1.1.0"
-      gem "poltergeist", "~>0.6.0"
-    end
-    gem "cucumber", "=1.1.0"
-    gem 'cucumber-rails2', "~> 0.3.5"
-    gem "culerity", "=0.2.15"
-  end
-  gem "database_cleaner"
-  if RAILS_VERSION_IS_3
-    gem "gherkin", "~> 2.6"
-  else
-    gem "gherkin", "~> 2.5.0"
-  end
-  gem "redgreen" if RUBY_VERSION < "1.9"
-  if RAILS_VERSION_IS_3
-    gem "rspec", '~>2.11.0'
-    gem "rspec-rails", '~> 2.11.0'
-  else
-    gem "rspec", "=1.3.1"
-    gem "rspec-rails", "=1.3.3"
-  end
-  if RUBY_VERSION >= "1.9"
-    gem "simplecov", "~>0.6"
-  else
-    gem "rcov",  "=0.9.11"
-  end
-  gem "ruby-prof", :platforms => [:ruby]
-  gem "spork"
-  gem "test-unit", "=1.2.3" if RUBY_VERSION >= "1.9" and ENV['IN_RBL_TESTENV'] == 'true'
-  gem "timecop", '~> 0.3.5'
-end
 
-# moved out of the dev group so backlogs can be tested by the user after install. Too many issues of weird setups with apache, nginx, etc.
-# thin doesn't work for jruby
-gem "thin", :platforms => [:ruby]

app/controllers/rb_all_projects_controller.rb

@@ -1,7 +1,7 @@
 class RbAllProjectsController < ApplicationController
   unloadable
 
-  before_filter :authorize_global
+  before_action :authorize_global
 
   def statistics
     backlogs_projects = RbCommonHelper.find_backlogs_enabled_active_projects

app/controllers/rb_application_controller.rb

@@ -2,7 +2,7 @@
 class RbApplicationController < ApplicationController
   unloadable
 
-  before_filter :load_project, :authorize, :check_if_plugin_is_configured
+  before_action :load_project, :authorize, :check_if_plugin_is_configured
 
   #provide list of javascript_include_tags which must be rendered before common.js
   def rb_jquery_plugins
@@ -35,9 +35,13 @@ def load_project
 
   def check_if_plugin_is_configured
     @settings = Backlogs.settings
-    if @settings[:story_trackers].blank? || @settings[:task_tracker].blank?
+#    make a copy to workaround RuntimeError (can't modify frozen ActionController::Parameters):
+    s1 = @settings.dup
+    if (s1[:story_trackers].blank? && s1['story_trackers'].blank?) || (s1[:task_tracker].blank? && s1['task_tracker'].blank?)
+      puts("check_if_plugin_is_configured: something is blank, halting. #{s1}")
       respond_to do |format|
-        format.html { render :file => "backlogs/not_configured" }
+        format.html { render :template => "backlogs/not_configured",  :handlers => [:erb], :formats => [:html] }
+        format.js { }
       end
     end
   end

app/controllers/rb_burndown_charts_controller.rb

@@ -11,7 +11,7 @@ def show
 
   def embedded
     respond_to do |format|
-      format.html { render :template => 'rb_burndown_charts/show.html.erb', :layout => false }
+      format.html { render :template => 'rb_burndown_charts/show', :layout => false, :handlers => [:erb], :formats => [:html] }
     end
   end
 

app/controllers/rb_calendars_controller.rb

@@ -5,7 +5,7 @@ class RbCalendarsController < RbApplicationController
 
   case Backlogs.platform
     when :redmine
-      before_filter :require_admin_or_api_request, :only => :ical
+      before_action :require_admin_or_api_request, :only => :ical
       accept_api_auth :ical
     when :chiliproject
       accept_key_auth :ical
@@ -23,7 +23,7 @@ def generate_ical
     cal = Icalendar::Calendar.new
 
     # current + future sprints
-    RbSprint.find(:all, :conditions => ["not sprint_start_date is null and not effective_date is null and project_id = ? and effective_date >= ?", @project.id, Date.today]).each {|sprint|
+    RbSprint.where("not sprint_start_date is null and not effective_date is null and project_id = ? and effective_date >= ?", @project.id, Date.today).find_each {|sprint|
       summary_text = l(:event_sprint_summary, { :project => @project.name, :summary => sprint.name } )
       description_text = "#{sprint.name}: #{url_for(:controller => 'rb_queries', :only_path => false, :action => 'show', :project_id => @project.id, :sprint_id => sprint.id)}\n#{sprint.description}"
 
@@ -84,7 +84,7 @@ def generate_ical
     conditions << @project.id
     conditions << Date.today
 
-    issues = Issue.find(:all, :include => :status, :conditions => conditions).each {|issue|
+    issues = Issue.where(conditions).joins(:status).includes(:status).find_each {|issue|
       summary_text = l(:todo_issue_summary, { :type => issue.tracker.name, :summary => issue.subject } )
       description_text = "#{issue.subject}: #{url_for(:controller => 'issues', :only_path => false, :action => 'show', :id => issue.id)}\n#{issue.description}"
       # I know this should be "cal.todo do", but outlook in it's

app/controllers/rb_hooks_render_controller.rb

@@ -13,7 +13,7 @@ def view_issues_sidebar
     }
 
     respond_to do |format|
-      format.html { render :template => 'backlogs/view_issues_sidebar.html.erb', :layout => false, :locals => locals }
+      format.html { render :template => 'backlogs/view_issues_sidebar', :layout => false, :locals => locals, :handlers => [:erb], :formats => [:html] }
     end
   end
 

app/controllers/rb_impediments_controller.rb

@@ -4,11 +4,13 @@ class RbImpedimentsController < RbApplicationController
   unloadable
 
   def create
-    @settings = Backlogs.settings
+    params.permit!
+    @settings = Backlogs.setting
     begin
       @impediment = RbTask.create_with_relationships(params, User.current.id, @project.id, true)
     rescue => e
-      render :text => e.message.blank? ? e.to_s : e.message, :status => 400
+      Rails.logger.error(e.message.blank? ? e.to_s : e.message)
+      render :partial => "backlogs/model_errors", :object => { "base" => e.message.blank? ? e.to_s : e.message }, :status => 400
       return
     end
 
@@ -22,8 +24,9 @@ def create
   end
 
   def update
+    params.permit!
     @impediment = RbTask.find_by_id(params[:id])
-    @settings = Backlogs.settings
+    @settings = Backlogs.setting
     begin
       result = @impediment.update_with_relationships(params)
     rescue => e

app/controllers/rb_master_backlogs_controller.rb

@@ -44,14 +44,14 @@ def _menu_new
         if projects.length > 1
           links << {:label => l(label_new), :url => '#', :sub => []}
           projects.each{|project|
-            links.first[:sub] << {:label => project.name, :url => '#', :classname => "#{add_class} project_id_#{project.id}"}
+            links.first[:sub] << {:label => project.name, :url => 'javascript:void(0);', :classname => "#{add_class} project_id_#{project.id}"}
           }
         else
-          links << {:label => l(label_new), :url => '#', :classname => "#{add_class} project_id_#{projects[0].id}"}
+          links << {:label => l(label_new), :url => 'javascript:void(0);', :classname => "#{add_class} project_id_#{projects[0].id}"}
         end
       end
     else #no sharing, only own project in the menu
-      links << {:label => l(label_new), :url => '#', :classname => add_class}
+      links << {:label => l(label_new), :url => 'javascript:void(0);', :classname => add_class}
     end
     return links
   end
@@ -100,20 +100,14 @@ def menu
              } if @release
     links << {:label => l(:label_sprint_close),
               :url => url_for(:controller => 'rb_sprints', :action => 'close', :sprint_id => @sprint, :only_path => true)
-              } if @sprint && @sprint.open? && @sprint.stories.open.none? && User.current.allowed_to?(:update_sprints, @project)        
+              } if @sprint && @sprint.open? && @sprint.stories.open.none? && User.current.allowed_to?(:update_sprints, @project)
 
 
     respond_to do |format|
       format.html { render :json => links }
     end
   end
 
-  if Rails::VERSION::MAJOR < 3
-    def view_context
-      @template
-    end
-  end
-
   def closed_sprints
     c_sprints = @project.closed_shared_sprints
     @backlogs = RbStory.backlogs_by_sprint(@project, c_sprints)

app/controllers/rb_project_settings_controller.rb

@@ -23,4 +23,7 @@ def project_settings
                 :tab => 'backlogs'
   end
 
+  def project_settings_params
+    params.require(:rb_project_settings).permit(:project_id);
+  end
 end

app/controllers/rb_queries_controller.rb

@@ -2,7 +2,7 @@ class RbQueriesController < RbApplicationController
   unloadable
 
   def show
-    @query = __IssueQueryClass.new(:name => "_")
+    @query = IssueQuery.new(:name => "_")
     @query.project = @project
     group_by = nil
 
@@ -25,28 +25,18 @@ def show
     column_names = @query.columns.collect{|col| col.name}
     column_names = column_names + ['position'] unless column_names.include?('position')
 
-    session[:query] = {:project_id => @query.project_id, :filters => @query.filters, :column_names => column_names, :group_by => group_by}
+    session[:issue_query] = {:project_id => @query.project_id, :filters => @query.filters, :column_names => column_names, :group_by => group_by}
     redirect_to :controller => 'issues', :action => 'index', :project_id => @project.id, :sort => 'position'
   end
 
   def impediments
-    @query = __IssueQueryClass.new(:name => "_")
+    @query = IssueQuery.new(:name => "_")
     @query.project = @project
     @query.add_filter("status_id", 'o', ['']) # only open
     @query.add_filter("fixed_version_id", '=', [params[:sprint_id]])
     @query.add_filter("backlogs_issue_type", '=', ['impediment'])
-    session[:query] = {:project_id => @query.project_id, :filters => @query.filters }
+    session[:issue_query] = {:project_id => @query.project_id, :filters => @query.filters }
     redirect_to :controller => 'issues', :action => 'index', :project_id => @project.id
   end
 
-  private
-
-  def __IssueQueryClass
-    if (Redmine::VERSION::MAJOR > 2) || (Redmine::VERSION::MAJOR == 2 && Redmine::VERSION::MINOR >= 3)
-      IssueQuery
-    else
-      Query
-    end
-  end
-
 end

app/controllers/rb_releases_controller.rb

@@ -22,18 +22,23 @@ def show
   end
 
   def new
-    @release = RbRelease.new(:project => @project)
-    if request.post?
-      @release.attributes = params[:release]
-      if @release.save
-        flash[:notice] = l(:notice_successful_create)
-        redirect_to :action => 'index', :project_id => @project
-      end
+    @release = RbRelease.new
+    @release.project = @project
+  end
+
+  def create
+    @release = RbRelease.new(release_params)
+    @release.project = @project
+    if @release.save
+      flash[:notice] = l(:notice_successful_create)
+      redirect_to :action => 'index', :project_id => @project
+    else
+      render action: :new
     end
   end
 
   def edit
-    if request.post? and @release.update_attributes(params[:release])
+    if request.post? and @release.update_attributes(release_params)
       flash[:notice] = l(:notice_successful_update)
       redirect_to :controller => 'rb_releases', :action => 'show', :release_id => @release
 #    else
@@ -44,7 +49,7 @@ def edit
   def update
     except = ['id', 'project_id']
     attribs = params.select{|k,v| (!except.include? k) and (RbRelease.column_names.include? k) }
-    attribs = Hash[*attribs.flatten]
+    attribs = attribs.to_enum.to_h
     begin
       result  = @release.update_attributes attribs
     rescue => e
@@ -64,4 +69,10 @@ def destroy
     redirect_to :controller => 'rb_releases', :action => 'index', :project_id => @project
   end
 
+  private
+
+  def release_params
+    params.require(:release).permit(:name, :description, :status, :release_start_date, :release_end_date, :planned_velocity, :sharing)
+  end
+
 end