diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-06-29 12:01:20 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-06-29 12:01:20 +0000 |
| commit | 1424b0f215082fff57d840dc715f5875bea45ef0 (patch) | |
| tree | 1b0ee883e614f65c3f74f265ccb54b9992f8e970 /app/controllers | |
| parent | 94cf4f258ff61bac4708c9a8dcba5c50b8adcf94 (diff) | |
| download | redmine-1424b0f215082fff57d840dc715f5875bea45ef0.tar.gz redmine-1424b0f215082fff57d840dc715f5875bea45ef0.zip | |
Addq "please select" to activity select box if no activity is set as default (#937).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1602 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/issues_controller.rb | 3 | ||||
| -rw-r--r-- | app/controllers/timelog_controller.rb | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 49b443238..5bc65d2e4 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -43,6 +43,7 @@ class IssuesController < ApplicationController helper :sort include SortHelper include IssuesHelper + helper :timelog def index sort_init "#{Issue.table_name}.id", "desc" @@ -99,7 +100,6 @@ class IssuesController < ApplicationController @journals.reverse! if User.current.wants_comments_in_reverse_order? @allowed_statuses = @issue.new_statuses_allowed_to(User.current) @edit_allowed = User.current.allowed_to?(:edit_issues, @project) - @activities = Enumeration::get_values('ACTI') @priorities = Enumeration::get_values('IPRI') @time_entry = TimeEntry.new respond_to do |format| @@ -157,7 +157,6 @@ class IssuesController < ApplicationController def edit @allowed_statuses = @issue.new_statuses_allowed_to(User.current) - @activities = Enumeration::get_values('ACTI') @priorities = Enumeration::get_values('IPRI') @edit_allowed = User.current.allowed_to?(:edit_issues, @project) diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb index cf1c844df..9f539d459 100644 --- a/app/controllers/timelog_controller.rb +++ b/app/controllers/timelog_controller.rb @@ -183,7 +183,6 @@ class TimelogController < ApplicationController redirect_to(params[:back_url].blank? ? {:action => 'details', :project_id => @time_entry.project} : params[:back_url]) return end - @activities = Enumeration::get_values('ACTI') end def destroy |