Commit 74b05704 authored by edavis10's avatar edavis10

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

* Changed TimelogHelper#activity_collection_for_select_options to only use
  active TimeEntryActivities.
* Changed TimelogHelper#activity_collection_for_select_options to return a blank
  option if the time_entry's current activity is inactive.

  #4077

git-svn-id: https://svn.redmine.org/redmine/trunk@2946 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 1ac2ad09
......@@ -25,11 +25,18 @@ module TimelogHelper
links << link_to_issue(@issue) if @issue
breadcrumb links
end
def activity_collection_for_select_options
activities = TimeEntryActivity.all
# Returns a collection of activities for a select field. time_entry
# 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 = []
collection << [ "--- #{l(:actionview_instancetag_blank_option)} ---", '' ] unless activities.detect(&:is_default)
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
......
......@@ -53,9 +53,17 @@ class Enumeration < ActiveRecord::Base
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
......
......@@ -6,6 +6,9 @@
<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]-->
......@@ -13,4 +16,4 @@
<% @enumeration.custom_field_values.each do |value| %>
<p><%= custom_field_tag_with_label :enumeration, value %></p>
<% end %>
</div>
\ No newline at end of file
</div>
......@@ -6,10 +6,18 @@
<% 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 },
......
......@@ -9,7 +9,7 @@
<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 %>
......
......@@ -748,6 +748,8 @@ en:
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]+$
......
class AddActiveFieldToEnumerations < ActiveRecord::Migration
def self.up
add_column :enumerations, :active, :boolean, :default => true, :null => false
end
def self.down
remove_column :enumerations, :active
end
end
......@@ -4,66 +4,85 @@ enumerations_001:
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
# -*- coding: utf-8 -*-
# redMine - project management software
# Copyright (C) 2006-2007 Jean-Philippe Lang
#
......@@ -71,6 +72,28 @@ class TimelogControllerTest < ActionController::TestCase
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment