jro_apps/redmine Commit - r9562:733fef458c5c

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

Jean-Philippe Lang -

r9562:733fef458c5c

parent child

Context file:

r9562:733fef458c5c

Collapse all files

app/models/group.rb +7 -1

                 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|

app/views/groups/_form.html.erb +1 -1

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

test/functional/groups_controller_test.rb +6 -5

                 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')
               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')
               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'
               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

test/object_helpers.rb +1 -1

                 @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

test/unit/group_test.rb +3 -1

               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

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