mirror of
https://github.com/redmine/redmine.git
synced 2026-03-04 03:21:24 +01:00
added activities enumeration for time tracking
git-svn-id: http://redmine.rubyforge.org/svn/branches/work@365 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -30,7 +30,7 @@ class TimelogController < ApplicationController
|
||||
redirect_to :action => 'details', :project_id => @time_entry.project, :issue_id => @time_entry.issue
|
||||
return
|
||||
end
|
||||
@activities = Enumeration.find :all
|
||||
@activities = Enumeration::get_values('ACTI')
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
@@ -24,7 +24,8 @@ class Enumeration < ActiveRecord::Base
|
||||
|
||||
OPTIONS = {
|
||||
"IPRI" => :enumeration_issue_priorities,
|
||||
"DCAT" => :enumeration_doc_categories
|
||||
"DCAT" => :enumeration_doc_categories,
|
||||
"ACTI" => :enumeration_activities
|
||||
}.freeze
|
||||
|
||||
def self.get_values(option)
|
||||
@@ -42,6 +43,8 @@ private
|
||||
raise "Can't delete enumeration" if Issue.find(:first, :conditions => ["priority_id=?", self.id])
|
||||
when "DCAT"
|
||||
raise "Can't delete enumeration" if Document.find(:first, :conditions => ["category_id=?", self.id])
|
||||
when "ACTI"
|
||||
raise "Can't delete enumeration" if TimeEntry.find(:first, :conditions => ["activity_id=?", self.id])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -395,3 +395,4 @@ default_priority_immediate: Immédiat
|
||||
|
||||
enumeration_issue_priorities: Priorités des demandes
|
||||
enumeration_doc_categories: Catégories des documents
|
||||
enumeration_activities: Activités (suivi du temps)
|
||||
|
||||
Reference in New Issue
Block a user