Merged release/3.0 into dev

app/controllers/settings_controller.rb

@@ -53,7 +53,7 @@ class SettingsController < ApplicationController
       @options[:user_format] = User::USER_FORMATS.keys.collect {|f| [User.current.name(f), f.to_s] }
       @deliveries = ActionMailer::Base.perform_deliveries
 
-      @guessed_host_and_path = request.host_with_port.dup + OpenProject::Configuration.rails_relative_url_root
+      @guessed_host = request.host_with_port.dup
     end
   end
 

app/controllers/work_packages_controller.rb

@@ -384,10 +384,17 @@ class WorkPackagesController < ApplicationController
 
   def priorities
     priorities = IssuePriority.active
-    priorities << work_package.priority if work_package
+    augment_priorities_with_current_work_package_priority priorities
+
     priorities
   end
 
+  def augment_priorities_with_current_work_package_priority(priorities)
+    current_priority = work_package.try :priority
+
+    priorities << current_priority if current_priority && !priorities.include?(current_priority)
+  end
+
   def allowed_statuses
     work_package.new_statuses_allowed_to(current_user)
   end

app/models/work_package.rb

@@ -938,7 +938,7 @@ class WorkPackage < ActiveRecord::Base
   def set_default_values
     if new_record? # set default values for new records only
       self.status   ||= Status.default
-      self.priority ||= IssuePriority.default
+      self.priority ||= IssuePriority.active.default
     end
   end
 

app/views/settings/_general.html.erb

@@ -43,7 +43,7 @@ See doc/COPYRIGHT.rdoc for more details.
 <p><%= setting_text_field :activity_days_default, :size => 6 %> <%= l(:label_day_plural) %></p>
 
 <p><%= setting_text_field :host_name, :size => 60 %><br />
-<em><%= l(:label_example) %>: <%= @guessed_host_and_path %></em></p>
+<em><%= l(:label_example) %>: <%= @guessed_host %></em></p>
 
 <p><%= setting_select :protocol, [['HTTP', 'http'], ['HTTPS', 'https']] %></p>
 

config/locales/en.yml

@@ -1258,7 +1258,7 @@ en:
   setting_file_max_size_displayed: "Max size of text files displayed inline"
   setting_gravatar_default: "Default Gravatar image"
   setting_gravatar_enabled: "Use Gravatar user icons"
-  setting_host_name: "Host name and path"
+  setting_host_name: "Host name"
   setting_work_package_done_ratio: "Calculate the work package done ratio with"
   setting_work_package_done_ratio_field: "Use the work package field"
   setting_work_package_done_ratio_status: "Use the work package status"

doc/CHANGELOG.md

@@ -31,6 +31,11 @@ See doc/COPYRIGHT.rdoc for more details.
 
 * `#5033` Migration RepairInvalidDefaultWorkPackageCustomValues fails on Postgres
 
+## 3.0.0pre50
+
+* `#4008` Deactivating work package priorities has no effect
+* Removed path from guessed host
+
 ## 3.0.0pre49
 
 * `#2616` Fix:  Search: Clicking on 'Back' results in wrong data

lib/open_project/version.rb

@@ -49,7 +49,7 @@ module OpenProject
     #
     #   2.0.0debian-2
     def self.special
-      'pre49'
+      'pre50'
     end
 
     def self.revision

spec/controllers/work_packages_controller_spec.rb

@@ -1,3 +1,4 @@
+#-- encoding: UTF-8
 #-- copyright
 # OpenProject is a project management system.
 # Copyright (C) 2012-2014 the OpenProject Foundation (OPF)