jro_apps/redmine Commit - r2832:e76d4c5c4c3f

Added an active field track if an Enumeration is active on the frontend view....

Eric Davis -

r2832:e76d4c5c4c3f

parent child

Context file:

r2832:e76d4c5c4c3f

Collapse all files

db/migrate/20090401231134_add_active_field_to_enumerations.rb created 644 +9 0

@@ -0,0 +1,9
	1	class AddActiveFieldToEnumerations < ActiveRecord::Migration
	2	def self.up
	3	add_column :enumerations, :active, :boolean, :default => true, :null => false
	4	end
	5
	6	def self.down
	7	remove_column :enumerations, :active
	8	end
	9	end

app/helpers/timelog_helper.rb +9 -2

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module TimelogHelper
               include ApplicationHelper
               def render_timelog_breadcrumb
                 links = []
                 links << link_to(l(:label_project_all), {:project_id => nil, :issue_id => nil})
                 links << link_to(h(@project), {:project_id => @project, :issue_id => nil}) if @project
                 links << link_to_issue(@issue) if @issue
                 breadcrumb links
               end
-              def activity_collection_for_select_options
+              # Returns a collection of activities for a select field.  time_entry
-                activities = TimeEntryActivity.all
+              # is optional and will be used to check if the selected TimeEntryActivity
+              # is active.
+              def activity_collection_for_select_options(time_entry=nil)
+                activities = TimeEntryActivity.active
                 collection = []
+                if time_entry && !time_entry.activity.active?
+                  collection << [ "--- #{l(:actionview_instancetag_blank_option)} ---", '' ]
+                else
                   collection << [ "--- #{l(:actionview_instancetag_blank_option)} ---", '' ] unless activities.detect(&:is_default)
+                end
                 activities.each { |a| collection << [a.name, a.id] }
                 collection
               end
               def select_hours(data, criteria, value)
               	if value.to_s.empty?
               		data.select {|row| row[criteria].blank? }
                 else
                 	data.select {|row| row[criteria] == value}
                 end
               end
               def sum_hours(data)
                 sum = 0
                 data.each do |row|
                   sum += row['hours'].to_f
                 end
                 sum
               end
               def options_for_period_select(value)
                 options_for_select([[l(:label_all_time), 'all'],
                                     [l(:label_today), 'today'],
                                     [l(:label_yesterday), 'yesterday'],
                                     [l(:label_this_week), 'current_week'],
                                     [l(:label_last_week), 'last_week'],
                                     [l(:label_last_n_days, 7), '7_days'],
                                     [l(:label_this_month), 'current_month'],
                                     [l(:label_last_month), 'last_month'],
                                     [l(:label_last_n_days, 30), '30_days'],
                                     [l(:label_this_year), 'current_year']],
                                     value)
               end
               def entries_to_csv(entries)
                 ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')
                 decimal_separator = l(:general_csv_decimal_separator)
                 custom_fields = TimeEntryCustomField.find(:all)
                 export = StringIO.new
                 CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
                   # csv header fields
                   headers = [l(:field_spent_on),
                              l(:field_user),
                              l(:field_activity),
                              l(:field_project),
                              l(:field_issue),
                              l(:field_tracker),
                              l(:field_subject),
                              l(:field_hours),
                              l(:field_comments)
                              ]
                   # Export custom fields
                   headers += custom_fields.collect(&:name)
                   csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
                   # csv lines
                   entries.each do |entry|
                     fields = [format_date(entry.spent_on),
                               entry.user,
                               entry.activity,
                               entry.project,
                               (entry.issue ? entry.issue.id : nil),
                               (entry.issue ? entry.issue.tracker : nil),
                               (entry.issue ? entry.issue.subject : nil),
                               entry.hours.to_s.gsub('.', decimal_separator),
                               entry.comments
                               ]
                     fields += custom_fields.collect {|f| show_value(entry.custom_value_for(f)) }
                     csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
                   end
                 end
                 export.rewind
                 export
               end
               def format_criteria_value(criteria, value)
                 value.blank? ? l(:label_none) : ((k = @available_criterias[criteria][:klass]) ? k.find_by_id(value.to_i) : format_value(value, @available_criterias[criteria][:format]))
               end
               def report_to_csv(criterias, periods, hours)
                 export = StringIO.new
                 CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
                   # Column headers
                   headers = criterias.collect {|criteria| l(@available_criterias[criteria][:label]) }
                   headers += periods
                   headers << l(:label_total)
                   csv << headers.collect {|c| to_utf8(c) }
                   # Content
                   report_criteria_to_csv(csv, criterias, periods, hours)
                   # Total row
                   row = [ l(:label_total) ] + [''] * (criterias.size - 1)
                   total = 0
                   periods.each do |period|
                     sum = sum_hours(select_hours(hours, @columns, period.to_s))
                     total += sum
                     row << (sum > 0 ? "%.2f" % sum : '')
                   end
                   row << "%.2f" %total
                   csv << row
                 end
                 export.rewind
                 export
               end
               def report_criteria_to_csv(csv, criterias, periods, hours, level=0)
                 hours.collect {|h| h[criterias[level]].to_s}.uniq.each do |value|
                   hours_for_value = select_hours(hours, criterias[level], value)
                   next if hours_for_value.empty?
                   row = [''] * level
                   row << to_utf8(format_criteria_value(criterias[level], value))
                   row += [''] * (criterias.length - level - 1)
                   total = 0
                   periods.each do |period|
                     sum = sum_hours(select_hours(hours_for_value, @columns, period.to_s))
                     total += sum
                     row << (sum > 0 ? "%.2f" % sum : '')
                   end
                   row << "%.2f" %total
                   csv << row
                   if criterias.length > level + 1
                     report_criteria_to_csv(csv, criterias, periods, hours_for_value, level + 1)
                   end
                 end
               end
               def to_utf8(s)
                 @ic ||= Iconv.new(l(:general_csv_encoding), 'UTF-8')
                 begin; @ic.iconv(s.to_s); rescue; s.to_s; end
               end
             end

app/models/enumeration.rb +8 0

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Enumeration < ActiveRecord::Base
               acts_as_list :scope => 'type = \'#{type}\''
               acts_as_customizable
               before_destroy :check_integrity
               validates_presence_of :name
               validates_uniqueness_of :name, :scope => [:type]
               validates_length_of :name, :maximum => 30
               # Backwards compatiblity named_scopes.
               # Can be removed post-0.9
               named_scope :priorities, :conditions => { :type => "IssuePriority" }, :order => 'position' do
                 ActiveSupport::Deprecation.warn("Enumeration#priorities is deprecated, use the IssuePriority class. (#{Redmine::Info.issue(3007)})")
                 def default
                   find(:first, :conditions => { :is_default => true })
                 end
               end
               named_scope :document_categories, :conditions => { :type => "DocumentCategory" }, :order => 'position' do
                 ActiveSupport::Deprecation.warn("Enumeration#document_categories is deprecated, use the DocumentCategories class. (#{Redmine::Info.issue(3007)})")
                 def default
                   find(:first, :conditions => { :is_default => true })
                 end
               end
               named_scope :activities, :conditions => { :type => "TimeEntryActivity" }, :order => 'position' do
                 ActiveSupport::Deprecation.warn("Enumeration#activities is deprecated, use the TimeEntryActivity class. (#{Redmine::Info.issue(3007)})")
                 def default
                   find(:first, :conditions => { :is_default => true })
                 end
               end
               named_scope :values, lambda {|type| { :conditions => { :type => type }, :order => 'position' } } do
                 def default
                   find(:first, :conditions => { :is_default => true })
                 end
               end
+              # End backwards compatiblity named_scopes
               named_scope :all, :order => 'position'
+              named_scope :active, lambda {
+                {
+                  :conditions => {:active => true},
+                  :order => 'position'
+                }
+              }
               def self.default
                 # Creates a fake default scope so Enumeration.default will check
                 # it's type.  STI subclasses will automatically add their own
                 # types to the finder.
                 if self.descends_from_active_record?
                   find(:first, :conditions => { :is_default => true, :type => 'Enumeration' })
                 else
                   # STI classes are
                   find(:first, :conditions => { :is_default => true })
                 end
               end
               # Overloaded on concrete classes
               def option_name
                 nil
               end
               # Backwards compatiblity.  Can be removed post-0.9
               def opt
                 ActiveSupport::Deprecation.warn("Enumeration#opt is deprecated, use the STI classes now. (#{Redmine::Info.issue(3007)})")
                 return OptName
               end
               def before_save
                 if is_default? && is_default_changed?
                   Enumeration.update_all("is_default = #{connection.quoted_false}", {:type => type})
                 end
               end
               # Overloaded on concrete classes
               def objects_count
               end
               def in_use?
                 self.objects_count != 0
               end
               alias :destroy_without_reassign :destroy
               # Destroy the enumeration
               # If a enumeration is specified, objects are reassigned
               def destroy(reassign_to = nil)
                 if reassign_to && reassign_to.is_a?(Enumeration)
                   self.transfer_relations(reassign_to)
                 end
                 destroy_without_reassign
               end
               def <=>(enumeration)
                 position <=> enumeration.position
               end
               def to_s; name end
               # Returns the Subclasses of Enumeration.  Each Subclass needs to be
               # required in development mode.
               #
               # Note: subclasses is protected in ActiveRecord
               def self.get_subclasses
                 @@subclasses[Enumeration]
               end
             private
               def check_integrity
                 raise "Can't delete enumeration" if self.in_use?
               end
             end
             # Force load the subclasses in development mode
             require_dependency 'time_entry_activity'
             require_dependency 'document_category'
             require_dependency 'issue_priority'

app/views/enumerations/_form.rhtml +3 0

             <%= error_messages_for 'enumeration' %>
             <div class="box">
             <!--[form:optvalue]-->
             <%= hidden_field 'enumeration', 'type'  %>
             <p><label for="enumeration_name"><%=l(:field_name)%></label>
             <%= text_field 'enumeration', 'name'  %></p>
+            <p><label for="enumeration_active"><%=l(:field_active)%></label>
+            <%= check_box 'enumeration', 'active'  %></p>
             <p><label for="enumeration_is_default"><%=l(:field_is_default)%></label>
             <%= check_box 'enumeration', 'is_default'  %></p>
             <!--[eoform:optvalue]-->
             <% @enumeration.custom_field_values.each do |value| %>
             	<p><%= custom_field_tag_with_label :enumeration, value %></p>
             <% end %>
             </div>

app/views/enumerations/list.rhtml +8 0

             <h2><%=l(:label_enumerations)%></h2>
             <% Enumeration.get_subclasses.each do |klass| %>
             <h3><%= l(klass::OptionName) %></h3>
             <% enumerations = klass.all %>
             <% if enumerations.any? %>
             <table class="list">
+            <tr>
+                <th><%= l(:field_name) %></th>
+                <th style="width:15%;"><%= l(:field_is_default) %></th>
+                <th style="width:15%;"><%= l(:field_active) %></th>
+                <th style="width:15%;"></th>
+                <th align="center" style="width:10%;"> </th>
+            </tr>
             <% enumerations.each do |enumeration| %>
             <tr class="<%= cycle('odd', 'even') %>">
                 <td><%= link_to h(enumeration), :action => 'edit', :id => enumeration %></td>
                 <td style="width:15%;"><%= image_tag('true.png') if enumeration.is_default? %></td>
+                <td style="width:15%;"><%= image_tag('true.png') if enumeration.active? %></td>
                 <td style="width:15%;"><%= reorder_links('enumeration', {:action => 'update', :id => enumeration}) %></td>
                 <td class="buttons">
                 <%= link_to l(:button_delete), { :action => 'destroy', :id => enumeration },
                 															 :method => :post,
                 															 :confirm => l(:text_are_you_sure),
                 															 :class => 'icon icon-del' %>
                 </td>
             </tr>
             <% end %>
             </table>
             <% reset_cycle %>
             <% end %>
             <p><%= link_to l(:label_enumeration_new), { :action => 'new', :type => klass.name } %></p>
             <% end %>
             <% html_title(l(:label_enumerations)) -%>

app/views/timelog/edit.rhtml +1 -1

             <h2><%= l(:label_spent_time) %></h2>
             <% labelled_tabular_form_for :time_entry, @time_entry, :url => {:action => 'edit', :id => @time_entry, :project_id => @time_entry.project} do |f| %>
             <%= error_messages_for 'time_entry' %>
             <%= back_url_hidden_field_tag %>
             <div class="box">
             <p><%= f.text_field :issue_id, :size => 6 %> <em><%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %></em></p>
             <p><%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
             <p><%= f.text_field :hours, :size => 6, :required => true %></p>
             <p><%= f.text_field :comments, :size => 100 %></p>
-            <p><%= f.select :activity_id, activity_collection_for_select_options, :required => true %></p>
+            <p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p>
             <% @time_entry.custom_field_values.each do |value| %>
             	<p><%= custom_field_tag_with_label :time_entry, value %></p>
             <% end %>
             <%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %>
             </div>
             <%= submit_tag l(:button_save) %>
             <% end %>

config/locales/en.yml +2 0

             en:
               date:
                 formats:
                   # Use the strftime parameters for formats.
                   # When no format has been given, it uses default.
                   # You can provide other formats here if you like!
                   default: "%m/%d/%Y"
                   short: "%b %d"
                   long: "%B %d, %Y"
                 day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
                 abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
                 # Don't forget the nil at the beginning; there's no such thing as a 0th month
                 month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
                 abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
                 # Used in date_select and datime_select.
                 order: [ :year, :month, :day ]
               time:
                 formats:
                   default: "%m/%d/%Y %I:%M %p"
                   time: "%I:%M %p"
                   short: "%d %b %H:%M"
                   long: "%B %d, %Y %H:%M"
                 am: "am"
                 pm: "pm"
               datetime:
                 distance_in_words:
                   half_a_minute: "half a minute"
                   less_than_x_seconds:
                     one:   "less than 1 second"
                     other: "less than {{count}} seconds"
                   x_seconds:
                     one:   "1 second"
                     other: "{{count}} seconds"
                   less_than_x_minutes:
                     one:   "less than a minute"
                     other: "less than {{count}} minutes"
                   x_minutes:
                     one:   "1 minute"
                     other: "{{count}} minutes"
                   about_x_hours:
                     one:   "about 1 hour"
                     other: "about {{count}} hours"
                   x_days:
                     one:   "1 day"
                     other: "{{count}} days"
                   about_x_months:
                     one:   "about 1 month"
                     other: "about {{count}} months"
                   x_months:
                     one:   "1 month"
                     other: "{{count}} months"
                   about_x_years:
                     one:   "about 1 year"
                     other: "about {{count}} years"
                   over_x_years:
                     one:   "over 1 year"
                     other: "over {{count}} years"
               number:
                 human:
                   format:
                     delimiter: ""
                     precision: 1
                   storage_units:
                     format: "%n %u"
                     units:
                       byte:
                         one: "Byte"
                         other: "Bytes"
                       kb: "KB"
                       mb: "MB"
                       gb: "GB"
                       tb: "TB"
             # Used in array.to_sentence.
               support:
                 array:
                   sentence_connector: "and"
                   skip_last_comma: false
               activerecord:
                 errors:
                   messages:
                     inclusion: "is not included in the list"
                     exclusion: "is reserved"
                     invalid: "is invalid"
                     confirmation: "doesn't match confirmation"
                     accepted: "must be accepted"
                     empty: "can't be empty"
                     blank: "can't be blank"
                     too_long: "is too long (maximum is {{count}} characters)"
                     too_short: "is too short (minimum is {{count}} characters)"
                     wrong_length: "is the wrong length (should be {{count}} characters)"
                     taken: "has already been taken"
                     not_a_number: "is not a number"
                     not_a_date: "is not a valid date"
                     greater_than: "must be greater than {{count}}"
                     greater_than_or_equal_to: "must be greater than or equal to {{count}}"
                     equal_to: "must be equal to {{count}}"
                     less_than: "must be less than {{count}}"
                     less_than_or_equal_to: "must be less than or equal to {{count}}"
                     odd: "must be odd"
                     even: "must be even"
                     greater_than_start_date: "must be greater than start date"
                     not_same_project: "doesn't belong to the same project"
                     circular_dependency: "This relation would create a circular dependency"
               actionview_instancetag_blank_option: Please select
               general_text_No: 'No'
               general_text_Yes: 'Yes'
               general_text_no: 'no'
               general_text_yes: 'yes'
               general_lang_name: 'English'
               general_csv_separator: ','
               general_csv_decimal_separator: '.'
               general_csv_encoding: ISO-8859-1
               general_pdf_encoding: ISO-8859-1
               general_first_day_of_week: '7'
               notice_account_updated: Account was successfully updated.
               notice_account_invalid_creditentials: Invalid user or password
               notice_account_password_updated: Password was successfully updated.
               notice_account_wrong_password: Wrong password
               notice_account_register_done: Account was successfully created. To activate your account, click on the link that was emailed to you.
               notice_account_unknown_email: Unknown user.
               notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password.
               notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you.
               notice_account_activated: Your account has been activated. You can now log in.
               notice_successful_create: Successful creation.
               notice_successful_update: Successful update.
               notice_successful_delete: Successful deletion.
               notice_successful_connection: Successful connection.
               notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
               notice_locking_conflict: Data has been updated by another user.
               notice_not_authorized: You are not authorized to access this page.
               notice_email_sent: "An email was sent to {{value}}"
               notice_email_error: "An error occurred while sending mail ({{value}})"
               notice_feeds_access_key_reseted: Your RSS access key was reset.
               notice_failed_to_save_issues: "Failed to save {{count}} issue(s) on {{total}} selected: {{ids}}."
               notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
               notice_account_pending: "Your account was created and is now pending administrator approval."
               notice_default_data_loaded: Default configuration successfully loaded.
               notice_unable_delete_version: Unable to delete version.
               error_can_t_load_default_data: "Default configuration could not be loaded: {{value}}"
               error_scm_not_found: "The entry or revision was not found in the repository."
               error_scm_command_failed: "An error occurred when trying to access the repository: {{value}}"
               error_scm_annotate: "The entry does not exist or can not be annotated."
               error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
               error_no_tracker_in_project: 'No tracker is associated to this project. Please check the Project settings.'
               error_no_default_issue_status: 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
               warning_attachments_not_saved: "{{count}} file(s) could not be saved."
               mail_subject_lost_password: "Your {{value}} password"
               mail_body_lost_password: 'To change your password, click on the following link:'
               mail_subject_register: "Your {{value}} account activation"
               mail_body_register: 'To activate your account, click on the following link:'
               mail_body_account_information_external: "You can use your {{value}} account to log in."
               mail_body_account_information: Your account information
               mail_subject_account_activation_request: "{{value}} account activation request"
               mail_body_account_activation_request: "A new user ({{value}}) has registered. The account is pending your approval:"
               mail_subject_reminder: "{{count}} issue(s) due in the next days"
               mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:"
               mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
               mail_body_wiki_content_added: "The '{{page}}' wiki page has been added by {{author}}."
               mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
               mail_body_wiki_content_updated: "The '{{page}}' wiki page has been updated by {{author}}."
               gui_validation_error: 1 error
               gui_validation_error_plural: "{{count}} errors"
               field_name: Name
               field_description: Description
               field_summary: Summary
               field_is_required: Required
               field_firstname: Firstname
               field_lastname: Lastname
               field_mail: Email
               field_filename: File
               field_filesize: Size
               field_downloads: Downloads
               field_author: Author
               field_created_on: Created
               field_updated_on: Updated
               field_field_format: Format
               field_is_for_all: For all projects
               field_possible_values: Possible values
               field_regexp: Regular expression
               field_min_length: Minimum length
               field_max_length: Maximum length
               field_value: Value
               field_category: Category
               field_title: Title
               field_project: Project
               field_issue: Issue
               field_status: Status
               field_notes: Notes
               field_is_closed: Issue closed
               field_is_default: Default value
               field_tracker: Tracker
               field_subject: Subject
               field_due_date: Due date
               field_assigned_to: Assigned to
               field_priority: Priority
               field_fixed_version: Target version
               field_user: User
               field_role: Role
               field_homepage: Homepage
               field_is_public: Public
               field_parent: Subproject of
               field_is_in_chlog: Issues displayed in changelog
               field_is_in_roadmap: Issues displayed in roadmap
               field_login: Login
               field_mail_notification: Email notifications
               field_admin: Administrator
               field_last_login_on: Last connection
               field_language: Language
               field_effective_date: Date
               field_password: Password
               field_new_password: New password
               field_password_confirmation: Confirmation
               field_version: Version
               field_type: Type
               field_host: Host
               field_port: Port
               field_account: Account
               field_base_dn: Base DN
               field_attr_login: Login attribute
               field_attr_firstname: Firstname attribute
               field_attr_lastname: Lastname attribute
               field_attr_mail: Email attribute
               field_onthefly: On-the-fly user creation
               field_start_date: Start
               field_done_ratio: % Done
               field_auth_source: Authentication mode
               field_hide_mail: Hide my email address
               field_comments: Comment
               field_url: URL
               field_start_page: Start page
               field_subproject: Subproject
               field_hours: Hours
               field_activity: Activity
               field_spent_on: Date
               field_identifier: Identifier
               field_is_filter: Used as a filter
               field_issue_to: Related issue
               field_delay: Delay
               field_assignable: Issues can be assigned to this role
               field_redirect_existing_links: Redirect existing links
               field_estimated_hours: Estimated time
               field_column_names: Columns
               field_time_zone: Time zone
               field_searchable: Searchable
               field_default_value: Default value
               field_comments_sorting: Display comments
               field_parent_title: Parent page
               field_editable: Editable
               field_watcher: Watcher
               field_identity_url: OpenID URL
               field_content: Content
               field_group_by: Group results by
               setting_app_title: Application title
               setting_app_subtitle: Application subtitle
               setting_welcome_text: Welcome text
               setting_default_language: Default language
               setting_login_required: Authentication required
               setting_self_registration: Self-registration
               setting_attachment_max_size: Attachment max. size
               setting_issues_export_limit: Issues export limit
               setting_mail_from: Emission email address
               setting_bcc_recipients: Blind carbon copy recipients (bcc)
               setting_plain_text_mail: Plain text mail (no HTML)
               setting_host_name: Host name and path
               setting_text_formatting: Text formatting
               setting_wiki_compression: Wiki history compression
               setting_feeds_limit: Feed content limit
               setting_default_projects_public: New projects are public by default
               setting_autofetch_changesets: Autofetch commits
               setting_sys_api_enabled: Enable WS for repository management
               setting_commit_ref_keywords: Referencing keywords
               setting_commit_fix_keywords: Fixing keywords
               setting_autologin: Autologin
               setting_date_format: Date format
               setting_time_format: Time format
               setting_cross_project_issue_relations: Allow cross-project issue relations
               setting_issue_list_default_columns: Default columns displayed on the issue list
               setting_repositories_encodings: Repositories encodings
               setting_commit_logs_encoding: Commit messages encoding
               setting_emails_footer: Emails footer
               setting_protocol: Protocol
               setting_per_page_options: Objects per page options
               setting_user_format: Users display format
               setting_activity_days_default: Days displayed on project activity
               setting_display_subprojects_issues: Display subprojects issues on main projects by default
               setting_enabled_scm: Enabled SCM
               setting_mail_handler_api_enabled: Enable WS for incoming emails
               setting_mail_handler_api_key: API key
               setting_sequential_project_identifiers: Generate sequential project identifiers
               setting_gravatar_enabled: Use Gravatar user icons
               setting_diff_max_lines_displayed: Max number of diff lines displayed
               setting_file_max_size_displayed: Max size of text files displayed inline
               setting_repository_log_display_limit: Maximum number of revisions displayed on file log
               setting_openid: Allow OpenID login and registration
               setting_password_min_length: Minimum password length
               setting_new_project_user_role_id: Role given to a non-admin user who creates a project
               permission_add_project: Create project
               permission_edit_project: Edit project
               permission_select_project_modules: Select project modules
               permission_manage_members: Manage members
               permission_manage_versions: Manage versions
               permission_manage_categories: Manage issue categories
               permission_add_issues: Add issues
               permission_edit_issues: Edit issues
               permission_manage_issue_relations: Manage issue relations
               permission_add_issue_notes: Add notes
               permission_edit_issue_notes: Edit notes
               permission_edit_own_issue_notes: Edit own notes
               permission_move_issues: Move issues
               permission_delete_issues: Delete issues
               permission_manage_public_queries: Manage public queries
               permission_save_queries: Save queries
               permission_view_gantt: View gantt chart
               permission_view_calendar: View calender
               permission_view_issue_watchers: View watchers list
               permission_add_issue_watchers: Add watchers
               permission_log_time: Log spent time
               permission_view_time_entries: View spent time
               permission_edit_time_entries: Edit time logs
               permission_edit_own_time_entries: Edit own time logs
               permission_manage_news: Manage news
               permission_comment_news: Comment news
               permission_manage_documents: Manage documents
               permission_view_documents: View documents
               permission_manage_files: Manage files
               permission_view_files: View files
               permission_manage_wiki: Manage wiki
               permission_rename_wiki_pages: Rename wiki pages
               permission_delete_wiki_pages: Delete wiki pages
               permission_view_wiki_pages: View wiki
               permission_view_wiki_edits: View wiki history
               permission_edit_wiki_pages: Edit wiki pages
               permission_delete_wiki_pages_attachments: Delete attachments
               permission_protect_wiki_pages: Protect wiki pages
               permission_manage_repository: Manage repository
               permission_browse_repository: Browse repository
               permission_view_changesets: View changesets
               permission_commit_access: Commit access
               permission_manage_boards: Manage boards
               permission_view_messages: View messages
               permission_add_messages: Post messages
               permission_edit_messages: Edit messages
               permission_edit_own_messages: Edit own messages
               permission_delete_messages: Delete messages
               permission_delete_own_messages: Delete own messages
               project_module_issue_tracking: Issue tracking
               project_module_time_tracking: Time tracking
               project_module_news: News
               project_module_documents: Documents
               project_module_files: Files
               project_module_wiki: Wiki
               project_module_repository: Repository
               project_module_boards: Boards
               label_user: User
               label_user_plural: Users
               label_user_new: New user
               label_project: Project
               label_project_new: New project
               label_project_plural: Projects
               label_x_projects:
                 zero:  no projects
                 one:   1 project
                 other: "{{count}} projects"
               label_project_all: All Projects
               label_project_latest: Latest projects
               label_issue: Issue
               label_issue_new: New issue
               label_issue_plural: Issues
               label_issue_view_all: View all issues
               label_issues_by: "Issues by {{value}}"
               label_issue_added: Issue added
               label_issue_updated: Issue updated
               label_document: Document
               label_document_new: New document
               label_document_plural: Documents
               label_document_added: Document added
               label_role: Role
               label_role_plural: Roles
               label_role_new: New role
               label_role_and_permissions: Roles and permissions
               label_member: Member
               label_member_new: New member
               label_member_plural: Members
               label_tracker: Tracker
               label_tracker_plural: Trackers
               label_tracker_new: New tracker
               label_workflow: Workflow
               label_issue_status: Issue status
               label_issue_status_plural: Issue statuses
               label_issue_status_new: New status
               label_issue_category: Issue category
               label_issue_category_plural: Issue categories
               label_issue_category_new: New category
               label_custom_field: Custom field
               label_custom_field_plural: Custom fields
               label_custom_field_new: New custom field
               label_enumerations: Enumerations
               label_enumeration_new: New value
               label_information: Information
               label_information_plural: Information
               label_please_login: Please log in
               label_register: Register
               label_login_with_open_id_option: or login with OpenID
               label_password_lost: Lost password
               label_home: Home
               label_my_page: My page
               label_my_account: My account
               label_my_projects: My projects
               label_administration: Administration
               label_login: Sign in
               label_logout: Sign out
               label_help: Help
               label_reported_issues: Reported issues
               label_assigned_to_me_issues: Issues assigned to me
               label_last_login: Last connection
               label_registered_on: Registered on
               label_activity: Activity
               label_overall_activity: Overall activity
               label_user_activity: "{{value}}'s activity"
               label_new: New
               label_logged_as: Logged in as
               label_environment: Environment
               label_authentication: Authentication
               label_auth_source: Authentication mode
               label_auth_source_new: New authentication mode
               label_auth_source_plural: Authentication modes
               label_subproject_plural: Subprojects
               label_and_its_subprojects: "{{value}} and its subprojects"
               label_min_max_length: Min - Max length
               label_list: List
               label_date: Date
               label_integer: Integer
               label_float: Float
               label_boolean: Boolean
               label_string: Text
               label_text: Long text
               label_attribute: Attribute
               label_attribute_plural: Attributes
               label_download: "{{count}} Download"
               label_download_plural: "{{count}} Downloads"
               label_no_data: No data to display
               label_change_status: Change status
               label_history: History
               label_attachment: File
               label_attachment_new: New file
               label_attachment_delete: Delete file
               label_attachment_plural: Files
               label_file_added: File added
               label_report: Report
               label_report_plural: Reports
               label_news: News
               label_news_new: Add news
               label_news_plural: News
               label_news_latest: Latest news
               label_news_view_all: View all news
               label_news_added: News added
               label_change_log: Change log
               label_settings: Settings
               label_overview: Overview
               label_version: Version
               label_version_new: New version
               label_version_plural: Versions
               label_confirmation: Confirmation
               label_export_to: 'Also available in:'
               label_read: Read...
               label_public_projects: Public projects
               label_open_issues: open
               label_open_issues_plural: open
               label_closed_issues: closed
               label_closed_issues_plural: closed
               label_x_open_issues_abbr_on_total:
                 zero:  0 open / {{total}}
                 one:   1 open / {{total}}
                 other: "{{count}} open / {{total}}"
               label_x_open_issues_abbr:
                 zero:  0 open
                 one:   1 open
                 other: "{{count}} open"
               label_x_closed_issues_abbr:
                 zero:  0 closed
                 one:   1 closed
                 other: "{{count}} closed"
               label_total: Total
               label_permissions: Permissions
               label_current_status: Current status
               label_new_statuses_allowed: New statuses allowed
               label_all: all
               label_none: none
               label_nobody: nobody
               label_next: Next
               label_previous: Previous
               label_used_by: Used by
               label_details: Details
               label_add_note: Add a note
               label_per_page: Per page
               label_calendar: Calendar
               label_months_from: months from
               label_gantt: Gantt
               label_internal: Internal
               label_last_changes: "last {{count}} changes"
               label_change_view_all: View all changes
               label_personalize_page: Personalize this page
               label_comment: Comment
               label_comment_plural: Comments
               label_x_comments:
                 zero: no comments
                 one: 1 comment
                 other: "{{count}} comments"
               label_comment_add: Add a comment
               label_comment_added: Comment added
               label_comment_delete: Delete comments
               label_query: Custom query
               label_query_plural: Custom queries
               label_query_new: New query
               label_filter_add: Add filter
               label_filter_plural: Filters
               label_equals: is
               label_not_equals: is not
               label_in_less_than: in less than
               label_in_more_than: in more than
               label_greater_or_equal: '>='
               label_less_or_equal: '<='
               label_in: in
               label_today: today
               label_all_time: all time
               label_yesterday: yesterday
               label_this_week: this week
               label_last_week: last week
               label_last_n_days: "last {{count}} days"
               label_this_month: this month
               label_last_month: last month
               label_this_year: this year
               label_date_range: Date range
               label_less_than_ago: less than days ago
               label_more_than_ago: more than days ago
               label_ago: days ago
               label_contains: contains
               label_not_contains: doesn't contain
               label_day_plural: days
               label_repository: Repository
               label_repository_plural: Repositories
               label_browse: Browse
               label_modification: "{{count}} change"
               label_modification_plural: "{{count}} changes"
               label_branch: Branch
               label_tag: Tag
               label_revision: Revision
               label_revision_plural: Revisions
               label_associated_revisions: Associated revisions
               label_added: added
               label_modified: modified
               label_copied: copied
               label_renamed: renamed
               label_deleted: deleted
               label_latest_revision: Latest revision
               label_latest_revision_plural: Latest revisions
               label_view_revisions: View revisions
               label_view_all_revisions: View all revisions
               label_max_size: Maximum size
               label_sort_highest: Move to top
               label_sort_higher: Move up
               label_sort_lower: Move down
               label_sort_lowest: Move to bottom
               label_roadmap: Roadmap
               label_roadmap_due_in: "Due in {{value}}"
               label_roadmap_overdue: "{{value}} late"
               label_roadmap_no_issues: No issues for this version
               label_search: Search
               label_result_plural: Results
               label_all_words: All words
               label_wiki: Wiki
               label_wiki_edit: Wiki edit
               label_wiki_edit_plural: Wiki edits
               label_wiki_page: Wiki page
               label_wiki_page_plural: Wiki pages
               label_index_by_title: Index by title
               label_index_by_date: Index by date
               label_current_version: Current version
               label_preview: Preview
               label_feed_plural: Feeds
               label_changes_details: Details of all changes
               label_issue_tracking: Issue tracking
               label_spent_time: Spent time
               label_f_hour: "{{value}} hour"
               label_f_hour_plural: "{{value}} hours"
               label_time_tracking: Time tracking
               label_change_plural: Changes
               label_statistics: Statistics
               label_commits_per_month: Commits per month
               label_commits_per_author: Commits per author
               label_view_diff: View differences
               label_diff_inline: inline
               label_diff_side_by_side: side by side
               label_options: Options
               label_copy_workflow_from: Copy workflow from
               label_permissions_report: Permissions report
               label_watched_issues: Watched issues
               label_related_issues: Related issues
               label_applied_status: Applied status
               label_loading: Loading...
               label_relation_new: New relation
               label_relation_delete: Delete relation
               label_relates_to: related to
               label_duplicates: duplicates
               label_duplicated_by: duplicated by
               label_blocks: blocks
               label_blocked_by: blocked by
               label_precedes: precedes
               label_follows: follows
               label_end_to_start: end to start
               label_end_to_end: end to end
               label_start_to_start: start to start
               label_start_to_end: start to end
               label_stay_logged_in: Stay logged in
               label_disabled: disabled
               label_show_completed_versions: Show completed versions
               label_me: me
               label_board: Forum
               label_board_new: New forum
               label_board_plural: Forums
               label_topic_plural: Topics
               label_message_plural: Messages
               label_message_last: Last message
               label_message_new: New message
               label_message_posted: Message added
               label_reply_plural: Replies
               label_send_information: Send account information to the user
               label_year: Year
               label_month: Month
               label_week: Week
               label_date_from: From
               label_date_to: To
               label_language_based: Based on user's language
               label_sort_by: "Sort by {{value}}"
               label_send_test_email: Send a test email
               label_feeds_access_key_created_on: "RSS access key created {{value}} ago"
               label_module_plural: Modules
               label_added_time_by: "Added by {{author}} {{age}} ago"
               label_updated_time_by: "Updated by {{author}} {{age}} ago"
               label_updated_time: "Updated {{value}} ago"
               label_jump_to_a_project: Jump to a project...
               label_file_plural: Files
               label_changeset_plural: Changesets
               label_default_columns: Default columns
               label_no_change_option: (No change)
               label_bulk_edit_selected_issues: Bulk edit selected issues
               label_theme: Theme
               label_default: Default
               label_search_titles_only: Search titles only
               label_user_mail_option_all: "For any event on all my projects"
               label_user_mail_option_selected: "For any event on the selected projects only..."
               label_user_mail_option_none: "Only for things I watch or I'm involved in"
               label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
               label_registration_activation_by_email: account activation by email
               label_registration_manual_activation: manual account activation
               label_registration_automatic_activation: automatic account activation
               label_display_per_page: "Per page: {{value}}"
               label_age: Age
               label_change_properties: Change properties
               label_general: General
               label_more: More
               label_scm: SCM
               label_plugins: Plugins
               label_ldap_authentication: LDAP authentication
               label_downloads_abbr: D/L
               label_optional_description: Optional description
               label_add_another_file: Add another file
               label_preferences: Preferences
               label_chronological_order: In chronological order
               label_reverse_chronological_order: In reverse chronological order
               label_planning: Planning
               label_incoming_emails: Incoming emails
               label_generate_key: Generate a key
               label_issue_watchers: Watchers
               label_example: Example
               label_display: Display
               label_sort: Sort
               label_ascending: Ascending
               label_descending: Descending
               label_date_from_to: From {{start}} to {{end}}
               label_wiki_content_added: Wiki page added
               label_wiki_content_updated: Wiki page updated
               label_group: Group
               label_group_plural: Groups
               label_group_new: New group
               label_time_entry_plural: Spent time
               button_login: Login
               button_submit: Submit
               button_save: Save
               button_check_all: Check all
               button_uncheck_all: Uncheck all
               button_delete: Delete
               button_create: Create
               button_create_and_continue: Create and continue
               button_test: Test
               button_edit: Edit
               button_add: Add
               button_change: Change
               button_apply: Apply
               button_clear: Clear
               button_lock: Lock
               button_unlock: Unlock
               button_download: Download
               button_list: List
               button_view: View
               button_move: Move
               button_back: Back
               button_cancel: Cancel
               button_activate: Activate
               button_sort: Sort
               button_log_time: Log time
               button_rollback: Rollback to this version
               button_watch: Watch
               button_unwatch: Unwatch
               button_reply: Reply
               button_archive: Archive
               button_unarchive: Unarchive
               button_reset: Reset
               button_rename: Rename
               button_change_password: Change password
               button_copy: Copy
               button_annotate: Annotate
               button_update: Update
               button_configure: Configure
               button_quote: Quote
               status_active: active
               status_registered: registered
               status_locked: locked
+              field_active: Active
               text_select_mail_notifications: Select actions for which email notifications should be sent.
               text_regexp_info: eg. ^[A-Z0-9]+$
               text_min_max_length_info: 0 means no restriction
               text_project_destroy_confirmation: Are you sure you want to delete this project and related data ?
               text_subprojects_destroy_warning: "Its subproject(s): {{value}} will be also deleted."
               text_workflow_edit: Select a role and a tracker to edit the workflow
               text_are_you_sure: Are you sure ?
               text_journal_changed: "{{label}} changed from {{old}} to {{new}}"
               text_journal_set_to: "{{label}} set to {{value}}"
               text_journal_deleted: "{{label}} deleted ({{old}})"
               text_journal_added: "{{label}} {{value}} added"
               text_tip_task_begin_day: task beginning this day
               text_tip_task_end_day: task ending this day
               text_tip_task_begin_end_day: task beginning and ending this day
               text_project_identifier_info: 'Only lower case letters (a-z), numbers and dashes are allowed.<br />Once saved, the identifier can not be changed.'
               text_caracters_maximum: "{{count}} characters maximum."
               text_caracters_minimum: "Must be at least {{count}} characters long."
               text_length_between: "Length between {{min}} and {{max}} characters."
               text_tracker_no_workflow: No workflow defined for this tracker
               text_unallowed_characters: Unallowed characters
               text_comma_separated: Multiple values allowed (comma separated).
               text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
               text_issue_added: "Issue {{id}} has been reported by {{author}}."
               text_issue_updated: "Issue {{id}} has been updated by {{author}}."
               text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
               text_issue_category_destroy_question: "Some issues ({{count}}) are assigned to this category. What do you want to do ?"
               text_issue_category_destroy_assignments: Remove category assignments
               text_issue_category_reassign_to: Reassign issues to this category
               text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
               text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
               text_load_default_configuration: Load the default configuration
               text_status_changed_by_changeset: "Applied in changeset {{value}}."
               text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
               text_select_project_modules: 'Select modules to enable for this project:'
               text_default_administrator_account_changed: Default administrator account changed
               text_file_repository_writable: Attachments directory writable
               text_plugin_assets_writable: Plugin assets directory writable
               text_rmagick_available: RMagick available (optional)
               text_destroy_time_entries_question: "{{hours}} hours were reported on the issues you are about to delete. What do you want to do ?"
               text_destroy_time_entries: Delete reported hours
               text_assign_time_entries_to_project: Assign reported hours to the project
               text_reassign_time_entries: 'Reassign reported hours to this issue:'
               text_user_wrote: "{{value}} wrote:"
               text_enumeration_destroy_question: "{{count}} objects are assigned to this value."
               text_enumeration_category_reassign_to: 'Reassign them to this value:'
               text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
               text_repository_usernames_mapping: "Select or update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
               text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
               text_custom_field_possible_values_info: 'One line for each value'
               text_wiki_page_destroy_question: "This page has {{descendants}} child page(s) and descendant(s). What do you want to do?"
               text_wiki_page_nullify_children: "Keep child pages as root pages"
               text_wiki_page_destroy_children: "Delete child pages and all their descendants"
               text_wiki_page_reassign_children: "Reassign child pages to this parent page"
               default_role_manager: Manager
               default_role_developper: Developer
               default_role_reporter: Reporter
               default_tracker_bug: Bug
               default_tracker_feature: Feature
               default_tracker_support: Support
               default_issue_status_new: New
               default_issue_status_in_progress: In Progress
               default_issue_status_resolved: Resolved
               default_issue_status_feedback: Feedback
               default_issue_status_closed: Closed
               default_issue_status_rejected: Rejected
               default_doc_category_user: User documentation
               default_doc_category_tech: Technical documentation
               default_priority_low: Low
               default_priority_normal: Normal
               default_priority_high: High
               default_priority_urgent: Urgent
               default_priority_immediate: Immediate
               default_activity_design: Design
               default_activity_development: Development
               enumeration_issue_priorities: Issue priorities
               enumeration_doc_categories: Document categories
               enumeration_activities: Activities (time tracking)

test/fixtures/enumerations.yml +19 0

             ---
             enumerations_001:
               name: Uncategorized
               id: 1
               opt: DCAT
               type: DocumentCategory
+              active: true
             enumerations_002:
               name: User documentation
               id: 2
               opt: DCAT
               type: DocumentCategory
+              active: true
             enumerations_003:
               name: Technical documentation
               id: 3
               opt: DCAT
               type: DocumentCategory
+              active: true
             enumerations_004:
               name: Low
               id: 4
               opt: IPRI
               type: IssuePriority
+              active: true
             enumerations_005:
               name: Normal
               id: 5
               opt: IPRI
               type: IssuePriority
               is_default: true
+              active: true
             enumerations_006:
               name: High
               id: 6
               opt: IPRI
               type: IssuePriority
+              active: true
             enumerations_007:
               name: Urgent
               id: 7
               opt: IPRI
               type: IssuePriority
+              active: true
             enumerations_008:
               name: Immediate
               id: 8
               opt: IPRI
               type: IssuePriority
+              active: true
             enumerations_009:
               name: Design
               id: 9
               opt: ACTI
               type: TimeEntryActivity
+              active: true
             enumerations_010:
               name: Development
               id: 10
               opt: ACTI
               type: TimeEntryActivity
               is_default: true
+              active: true
             enumerations_011:
               name: QA
               id: 11
               opt: ACTI
               type: TimeEntryActivity
+              active: true
             enumerations_012:
               name: Default Enumeration
               id: 12
               opt: ''
               type: Enumeration
               is_default: true
+              active: true
             enumerations_013:
               name: Another Enumeration
               id: 13
               opt: ''
               type: Enumeration
+              active: true
+            enumerations_014:
+              name: Inactive Activity
+              id: 14
+              opt: ACTI
+              type: TimeEntryActivity
+              active: false

test/functional/timelog_controller_test.rb +23 0

+            # -*- coding: utf-8 -*-
             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             require 'timelog_controller'
             # Re-raise errors caught by the controller.
             class TimelogController; def rescue_action(e) raise e end; end
             class TimelogControllerTest < ActionController::TestCase
               fixtures :projects, :enabled_modules, :roles, :members, :member_roles, :issues, :time_entries, :users, :trackers, :enumerations, :issue_statuses, :custom_fields, :custom_values
               def setup
                 @controller = TimelogController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
               end
               def test_edit_routing
                 assert_routing(
                   {:method => :get, :path => '/issues/567/time_entries/new'},
                   :controller => 'timelog', :action => 'edit', :issue_id => '567'
                 )
                 assert_routing(
                   {:method => :get, :path => '/projects/ecookbook/time_entries/new'},
                   :controller => 'timelog', :action => 'edit', :project_id => 'ecookbook'
                 )
                 assert_routing(
                   {:method => :get, :path => '/projects/ecookbook/issues/567/time_entries/new'},
                   :controller => 'timelog', :action => 'edit', :project_id => 'ecookbook', :issue_id => '567'
                 )
                 #TODO: change new form to POST to issue_time_entries_path instead of to edit action
                 #TODO: change edit form to PUT to time_entry_path
                 assert_routing(
                   {:method => :get, :path => '/time_entries/22/edit'},
                   :controller => 'timelog', :action => 'edit', :id => '22'
                 )
               end
               def test_get_edit
                 @request.session[:user_id] = 3
                 get :edit, :project_id => 1
                 assert_response :success
                 assert_template 'edit'
                 # Default activity selected
                 assert_tag :tag => 'option', :attributes => { :selected => 'selected' },
                                              :content => 'Development'
               end
               def test_get_edit_existing_time
                 @request.session[:user_id] = 2
                 get :edit, :id => 2, :project_id => nil
                 assert_response :success
                 assert_template 'edit'
                 # Default activity selected
                 assert_tag :tag => 'form', :attributes => { :action => '/projects/ecookbook/timelog/edit/2' }
               end
+              def test_get_edit_should_only_show_active_time_entry_activities
+                @request.session[:user_id] = 3
+                get :edit, :project_id => 1
+                assert_response :success
+                assert_template 'edit'
+                assert_no_tag :tag => 'option', :content => 'Inactive Activity'
+              end
+              def test_get_edit_with_an_existing_time_entry_with_inactive_activity
+                te = TimeEntry.find(1)
+                te.activity = TimeEntryActivity.find_by_name("Inactive Activity")
+                te.save!
+                @request.session[:user_id] = 1
+                get :edit, :project_id => 1, :id => 1
+                assert_response :success
+                assert_template 'edit'
+                # Blank option since nothing is pre-selected
+                assert_tag :tag => 'option', :content => '--- Please select ---'
+              end
               def test_post_edit
                 # TODO: should POST to issues’ time log instead of project. change form
                 # and routing
                 @request.session[:user_id] = 3
                 post :edit, :project_id => 1,
                             :time_entry => {:comments => 'Some work on TimelogControllerTest',
                                             # Not the default activity
                                             :activity_id => '11',
                                             :spent_on => '2008-03-14',
                                             :issue_id => '1',
                                             :hours => '7.3'}
                 assert_redirected_to :action => 'details', :project_id => 'ecookbook'
                 i = Issue.find(1)
                 t = TimeEntry.find_by_comments('Some work on TimelogControllerTest')
                 assert_not_nil t
                 assert_equal 11, t.activity_id
                 assert_equal 7.3, t.hours
                 assert_equal 3, t.user_id
                 assert_equal i, t.issue
                 assert_equal i.project, t.project
               end
               def test_update
                 entry = TimeEntry.find(1)
                 assert_equal 1, entry.issue_id
                 assert_equal 2, entry.user_id
                 @request.session[:user_id] = 1
                 post :edit, :id => 1,
                             :time_entry => {:issue_id => '2',
                                             :hours => '8'}
                 assert_redirected_to :action => 'details', :project_id => 'ecookbook'
                 entry.reload
                 assert_equal 8, entry.hours
                 assert_equal 2, entry.issue_id
                 assert_equal 2, entry.user_id
               end
               def test_destroy_routing
                 #TODO: use DELETE to time_entry_path
                 assert_routing(
                   {:method => :post, :path => '/time_entries/55/destroy'},
                   :controller => 'timelog', :action => 'destroy', :id => '55'
                 )
               end
               def test_destroy
                 @request.session[:user_id] = 2
                 post :destroy, :id => 1
                 assert_redirected_to :action => 'details', :project_id => 'ecookbook'
                 assert_nil TimeEntry.find_by_id(1)
               end
               def test_report_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/567/time_entries/report'},
                   :controller => 'timelog', :action => 'report', :project_id => '567'
                 )
                 assert_routing(
                   {:method => :get, :path => '/projects/567/time_entries/report.csv'},
                   :controller => 'timelog', :action => 'report', :project_id => '567', :format => 'csv'
                 )
               end
               def test_report_no_criteria
                 get :report, :project_id => 1
                 assert_response :success
                 assert_template 'report'
               end
               def test_report_routing_for_all_projects
                 assert_routing(
                   {:method => :get, :path => '/time_entries/report'},
                   :controller => 'timelog', :action => 'report'
                 )
               end
               def test_report_all_projects
                 get :report
                 assert_response :success
                 assert_template 'report'
               end
               def test_report_all_projects_denied
                 r = Role.anonymous
                 r.permissions.delete(:view_time_entries)
                 r.permissions_will_change!
                 r.save
                 get :report
                 assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Ftime_entries%2Freport'
               end
               def test_report_all_projects_one_criteria
                 get :report, :columns => 'week', :from => "2007-04-01", :to => "2007-04-30", :criterias => ['project']
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "8.65", "%.2f" % assigns(:total_hours)
               end
               def test_report_all_time
                 get :report, :project_id => 1, :criterias => ['project', 'issue']
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
               end
               def test_report_all_time_by_day
                 get :report, :project_id => 1, :criterias => ['project', 'issue'], :columns => 'day'
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
                 assert_tag :tag => 'th', :content => '2007-03-12'
               end
               def test_report_one_criteria
                 get :report, :project_id => 1, :columns => 'week', :from => "2007-04-01", :to => "2007-04-30", :criterias => ['project']
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "8.65", "%.2f" % assigns(:total_hours)
               end
               def test_report_two_criterias
                 get :report, :project_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criterias => ["member", "activity"]
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
               end
               def test_report_at_issue_level
                 get :report, :project_id => 1, :issue_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criterias => ["member", "activity"]
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "154.25", "%.2f" % assigns(:total_hours)
               end
               def test_report_custom_field_criteria
                 get :report, :project_id => 1, :criterias => ['project', 'cf_1']
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:total_hours)
                 assert_not_nil assigns(:criterias)
                 assert_equal 2, assigns(:criterias).size
                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
                 # Custom field column
                 assert_tag :tag => 'th', :content => 'Database'
                 # Custom field row
                 assert_tag :tag => 'td', :content => 'MySQL',
                                          :sibling => { :tag => 'td', :attributes => { :class => 'hours' },
                                                                      :child => { :tag => 'span', :attributes => { :class => 'hours hours-int' },
                                                                                                  :content => '1' }}
               end
               def test_report_one_criteria_no_result
                 get :report, :project_id => 1, :columns => 'week', :from => "1998-04-01", :to => "1998-04-30", :criterias => ['project']
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "0.00", "%.2f" % assigns(:total_hours)
               end
               def test_report_all_projects_csv_export
                 get :report, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30", :criterias => ["project", "member", "activity"], :format => "csv"
                 assert_response :success
                 assert_equal 'text/csv', @response.content_type
                 lines = @response.body.chomp.split("\n")
                 # Headers
                 assert_equal 'Project,Member,Activity,2007-1,2007-2,2007-3,2007-4,2007-5,2007-6,Total', lines.first
                 # Total row
                 assert_equal 'Total,"","","","",154.25,8.65,"","",162.90', lines.last
               end
               def test_report_csv_export
                 get :report, :project_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30", :criterias => ["project", "member", "activity"], :format => "csv"
                 assert_response :success
                 assert_equal 'text/csv', @response.content_type
                 lines = @response.body.chomp.split("\n")
                 # Headers
                 assert_equal 'Project,Member,Activity,2007-1,2007-2,2007-3,2007-4,2007-5,2007-6,Total', lines.first
                 # Total row
                 assert_equal 'Total,"","","","",154.25,8.65,"","",162.90', lines.last
               end
               def test_details_all_projects
                 get :details
                 assert_response :success
                 assert_template 'details'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
               end
               def test_project_details_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/567/time_entries'},
                   :controller => 'timelog', :action => 'details', :project_id => '567'
                 )
               end
               def test_details_at_project_level
                 get :details, :project_id => 1
                 assert_response :success
                 assert_template 'details'
                 assert_not_nil assigns(:entries)
                 assert_equal 4, assigns(:entries).size
                 # project and subproject
                 assert_equal [1, 3], assigns(:entries).collect(&:project_id).uniq.sort
                 assert_not_nil assigns(:total_hours)
                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
                 # display all time by default
                 assert_equal '2007-03-11'.to_date, assigns(:from)
                 assert_equal '2007-04-22'.to_date, assigns(:to)
               end
               def test_details_at_project_level_with_date_range
                 get :details, :project_id => 1, :from => '2007-03-20', :to => '2007-04-30'
                 assert_response :success
                 assert_template 'details'
                 assert_not_nil assigns(:entries)
                 assert_equal 3, assigns(:entries).size
                 assert_not_nil assigns(:total_hours)
                 assert_equal "12.90", "%.2f" % assigns(:total_hours)
                 assert_equal '2007-03-20'.to_date, assigns(:from)
                 assert_equal '2007-04-30'.to_date, assigns(:to)
               end
               def test_details_at_project_level_with_period
                 get :details, :project_id => 1, :period => '7_days'
                 assert_response :success
                 assert_template 'details'
                 assert_not_nil assigns(:entries)
                 assert_not_nil assigns(:total_hours)
                 assert_equal Date.today - 7, assigns(:from)
                 assert_equal Date.today, assigns(:to)
               end
               def test_issue_details_routing
                 assert_routing(
                   {:method => :get, :path => 'time_entries'},
                   :controller => 'timelog', :action => 'details'
                 )
                 assert_routing(
                   {:method => :get, :path => '/issues/234/time_entries'},
                   :controller => 'timelog', :action => 'details', :issue_id => '234'
                 )
                 # TODO: issue detail page shouldnt link to project_issue_time_entries_path but to normal issues one
                 # doesnt seem to have effect on resulting page so controller can be left untouched
                 assert_routing(
                   {:method => :get, :path => '/projects/ecookbook/issues/123/time_entries'},
                   :controller => 'timelog', :action => 'details', :project_id => 'ecookbook', :issue_id => '123'
                 )
               end
               def test_details_at_issue_level
                 get :details, :issue_id => 1
                 assert_response :success
                 assert_template 'details'
                 assert_not_nil assigns(:entries)
                 assert_equal 2, assigns(:entries).size
                 assert_not_nil assigns(:total_hours)
                 assert_equal 154.25, assigns(:total_hours)
                 # display all time by default
                 assert_equal '2007-03-11'.to_date, assigns(:from)
                 assert_equal '2007-04-22'.to_date, assigns(:to)
               end
               def test_details_formatted_routing
                 assert_routing(
                   {:method => :get, :path => 'time_entries.atom'},
                   :controller => 'timelog', :action => 'details', :format => 'atom'
                 )
                 assert_routing(
                   {:method => :get, :path => 'time_entries.csv'},
                   :controller => 'timelog', :action => 'details', :format => 'csv'
                 )
               end
               def test_details_for_project_formatted_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/567/time_entries.atom'},
                   :controller => 'timelog', :action => 'details', :format => 'atom', :project_id => '567'
                 )
                 assert_routing(
                   {:method => :get, :path => '/projects/567/time_entries.csv'},
                   :controller => 'timelog', :action => 'details', :format => 'csv', :project_id => '567'
                 )
               end
               def test_details_for_issue_formatted_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/ecookbook/issues/123/time_entries.atom'},
                   :controller => 'timelog', :action => 'details', :project_id => 'ecookbook', :issue_id => '123', :format => 'atom'
                 )
                 assert_routing(
                   {:method => :get, :path => '/projects/ecookbook/issues/123/time_entries.csv'},
                   :controller => 'timelog', :action => 'details', :project_id => 'ecookbook', :issue_id => '123', :format => 'csv'
                 )
               end
               def test_details_atom_feed
                 get :details, :project_id => 1, :format => 'atom'
                 assert_response :success
                 assert_equal 'application/atom+xml', @response.content_type
                 assert_not_nil assigns(:items)
                 assert assigns(:items).first.is_a?(TimeEntry)
               end
               def test_details_all_projects_csv_export
                 Setting.date_format = '%m/%d/%Y'
                 get :details, :format => 'csv'
                 assert_response :success
                 assert_equal 'text/csv', @response.content_type
                 assert @response.body.include?("Date,User,Activity,Project,Issue,Tracker,Subject,Hours,Comment\n")
                 assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,3,Bug,Error 281 when updating a recipe,1.0,\"\"\n")
               end
               def test_details_csv_export
                 Setting.date_format = '%m/%d/%Y'
                 get :details, :project_id => 1, :format => 'csv'
                 assert_response :success
                 assert_equal 'text/csv', @response.content_type
                 assert @response.body.include?("Date,User,Activity,Project,Issue,Tracker,Subject,Hours,Comment\n")
                 assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,3,Bug,Error 281 when updating a recipe,1.0,\"\"\n")
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages