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

                 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

app/models/enumeration.rb +8 0

                   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

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

             <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]-->

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

             <% 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 },

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

             <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 %>

config/locales/en.yml +2 0

               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

test/fixtures/enumerations.yml +19 0

               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

@@ -1,3 +1,4
		1	# -- coding: utf-8 --
1	# redMine - project management software	2	# redMine - project management software
2	# Copyright (C) 2006-2007 Jean-Philippe Lang	3	# Copyright (C) 2006-2007 Jean-Philippe Lang
3	#	4	#
@@ -71,6 +72,28 class TimelogControllerTest < ActionController::TestCase
71	assert_tag :tag => 'form', :attributes => { :action => '/projects/ecookbook/timelog/edit/2' }	72	assert_tag :tag => 'form', :attributes => { :action => '/projects/ecookbook/timelog/edit/2' }
72	end	73	end
73		74
		75	def test_get_edit_should_only_show_active_time_entry_activities
		76	@request.session[:user_id] = 3
		77	get :edit, :project_id => 1
		78	assert_response :success
		79	assert_template 'edit'
		80	assert_no_tag :tag => 'option', :content => 'Inactive Activity'
		81
		82	end
		83
		84	def test_get_edit_with_an_existing_time_entry_with_inactive_activity
		85	te = TimeEntry.find(1)
		86	te.activity = TimeEntryActivity.find_by_name("Inactive Activity")
		87	te.save!
		88
		89	@request.session[:user_id] = 1
		90	get :edit, :project_id => 1, :id => 1
		91	assert_response :success
		92	assert_template 'edit'
		93	# Blank option since nothing is pre-selected
		94	assert_tag :tag => 'option', :content => '--- Please select ---'
		95	end
		96
74	def test_post_edit	97	def test_post_edit
75	# TODO: should POST to issues’ time log instead of project. change form	98	# TODO: should POST to issues’ time log instead of project. change form
76	# and routing	99	# and routing

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