From 6f6201f9067f0da36cf070baff4354c96c435333 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 23 Mar 2007 10:45:50 +0000
Subject: [PATCH] added activities enumeration for time tracking

git-svn-id: http://redmine.rubyforge.org/svn/branches/work@365 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 time/app/controllers/timelog_controller.rb | 2 +-
 time/app/models/enumeration.rb             | 5 ++++-
 time/lang/fr.yml                           | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/time/app/controllers/timelog_controller.rb b/time/app/controllers/timelog_controller.rb
index df25c9679..31c618dbe 100644
--- a/time/app/controllers/timelog_controller.rb
+++ b/time/app/controllers/timelog_controller.rb
@@ -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
diff --git a/time/app/models/enumeration.rb b/time/app/models/enumeration.rb
index 0d6554f82..3f8df9221 100644
--- a/time/app/models/enumeration.rb
+++ b/time/app/models/enumeration.rb
@@ -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
diff --git a/time/lang/fr.yml b/time/lang/fr.yml
index 10f59fabc..fd63741b5 100644
--- a/time/lang/fr.yml
+++ b/time/lang/fr.yml
@@ -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)