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

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9745 e93f8b46-1217-0410-a6f0-8f06a7374b81

5 files changed, 18 insertions, 9 deletions

diff --git a/app/models/group.rb b/app/models/group.rb
index 1299aa742..80c97c3ac 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -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|
diff --git a/app/views/groups/_form.html.erb b/app/views/groups/_form.html.erb
index bca919b39..a5cb5d068 100644
--- a/app/views/groups/_form.html.erb
+++ b/app/views/groups/_form.html.erb
@@ -1,7 +1,7 @@
 <%= 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 %>
diff --git a/test/functional/groups_controller_test.rb b/test/functional/groups_controller_test.rb
index d28322810..efdca3883 100644
--- a/test/functional/groups_controller_test.rb
+++ b/test/functional/groups_controller_test.rb
@@ -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
diff --git a/test/object_helpers.rb b/test/object_helpers.rb
index 6db4336cf..a2d7c958f 100644
--- a/test/object_helpers.rb
+++ b/test/object_helpers.rb
@@ -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
diff --git a/test/unit/group_test.rb b/test/unit/group_test.rb
index 0351dd671..3d7c2da26 100644
--- a/test/unit/group_test.rb
+++ b/test/unit/group_test.rb
@@ -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