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:
1 parent
4a1bf9fe1b
commit
6f6201f906
3 files changed
+6
-2
No files matched your search
@@ -30,7 +30,7 @@ class TimelogController < ApplicationController
|
|||||||
redirect_to :action => 'details', :project_id => @time_entry.project, :issue_id => @time_entry.issue
|
redirect_to :action => 'details', :project_id => @time_entry.project, :issue_id => @time_entry.issue
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
@activities = Enumeration.find :all
|
@activities = Enumeration::get_values('ACTI')
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -24,7 +24,8 @@ class Enumeration < ActiveRecord::Base
|
|||||||
|
|
||||||
OPTIONS = {
|
OPTIONS = {
|
||||||
"IPRI" => :enumeration_issue_priorities,
|
"IPRI" => :enumeration_issue_priorities,
|
||||||
"DCAT" => :enumeration_doc_categories
|
"DCAT" => :enumeration_doc_categories,
|
||||||
|
"ACTI" => :enumeration_activities
|
||||||
}.freeze
|
}.freeze
|
||||||
|
|
||||||
def self.get_values(option)
|
def self.get_values(option)
|
||||||
@@ -42,6 +43,8 @@ private
|
|||||||
raise "Can't delete enumeration" if Issue.find(:first, :conditions => ["priority_id=?", self.id])
|
raise "Can't delete enumeration" if Issue.find(:first, :conditions => ["priority_id=?", self.id])
|
||||||
when "DCAT"
|
when "DCAT"
|
||||||
raise "Can't delete enumeration" if Document.find(:first, :conditions => ["category_id=?", self.id])
|
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
|
end
|
||||||
end
|
end
|
||||||
@@ -395,3 +395,4 @@ default_priority_immediate: Immédiat
|
|||||||
|
|
||||||
enumeration_issue_priorities: Priorités des demandes
|
enumeration_issue_priorities: Priorités des demandes
|
||||||
enumeration_doc_categories: Catégories des documents
|
enumeration_doc_categories: Catégories des documents
|
||||||
|
enumeration_activities: Activités (suivi du temps)
|
||||||
Reference in new issue
Block a user