Commit 137cb4bc authored by jplang's avatar jplang

Replaced group[lastname] parameter with group[name].

git-svn-id: https://svn.redmine.org/redmine/trunk@9745 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 9bd53935
......@@ -31,7 +31,13 @@ class Group < Principal
lastname.to_s
end
alias :name :to_s
def name
lastname
end
def name=(arg)
self.lastname = arg
end
def user_added(user)
members.each do |member|
......
<%= error_messages_for @group %>
<div class="box tabular">
<p><%= f.text_field :lastname, :label => :field_name %></p>
<p><%= f.text_field :name %></p>
<% @group.custom_field_values.each do |value| %>
<p><%= custom_field_tag_with_label :group, value %></p>
<% end %>
......
......@@ -40,11 +40,12 @@ class GroupsControllerTest < ActionController::TestCase
get :new
assert_response :success
assert_template 'new'
assert_select 'input[name=?]', 'group[name]'
end
def test_create
assert_difference 'Group.count' do
post :create, :group => {:lastname => 'New group'}
post :create, :group => {:name => 'New group'}
end
assert_redirected_to '/groups'
group = Group.first(:order => 'id DESC')
......@@ -54,7 +55,7 @@ class GroupsControllerTest < ActionController::TestCase
def test_create_and_continue
assert_difference 'Group.count' do
post :create, :group => {:lastname => 'New group'}, :continue => 'Create and continue'
post :create, :group => {:name => 'New group'}, :continue => 'Create and continue'
end
assert_redirected_to '/groups/new'
group = Group.first(:order => 'id DESC')
......@@ -63,7 +64,7 @@ class GroupsControllerTest < ActionController::TestCase
def test_create_with_failure
assert_no_difference 'Group.count' do
post :create, :group => {:lastname => ''}
post :create, :group => {:name => ''}
end
assert_response :success
assert_template 'new'
......@@ -79,14 +80,14 @@ class GroupsControllerTest < ActionController::TestCase
def test_update
new_name = 'New name'
put :update, :id => 10, :group => {:lastname => new_name}
put :update, :id => 10, :group => {:name => new_name}
assert_redirected_to '/groups'
group = Group.find(10)
assert_equal new_name, group.name
end
def test_update_with_failure
put :update, :id => 10, :group => {:lastname => ''}
put :update, :id => 10, :group => {:name => ''}
assert_response :success
assert_template 'edit'
end
......
......@@ -21,7 +21,7 @@ module ObjectHelpers
@generated_group_name ||= 'Group 0'
@generated_group_name.succ!
group = Group.new(attributes)
group.lastname = @generated_group_name if group.lastname.blank?
group.name = @generated_group_name if group.name.blank?
yield group if block_given?
group.save!
group
......
......@@ -31,8 +31,10 @@ class GroupTest < ActiveSupport::TestCase
include Redmine::I18n
def test_create
g = Group.new(:lastname => 'New group')
g = Group.new(:name => 'New group')
assert g.save
g.reload
assert_equal 'New group', g.name
end
def test_blank_name_error_message
......
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