jro_apps/redmine Commit - r14603:227594481e2d

Moving a custom field value in the order switches in the edit view (#21535)....

Jean-Philippe Lang -

r14603:227594481e2d

parent child

Context file:

r14603:227594481e2d

Collapse all files

test/ui/custom_fields_test_ui.rb created 644 +38 0

@@ -0,0 +1,38
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2015 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.expand_path('../base', __FILE__)
	19
	20	class Redmine::UiTest::CustomFieldsTest < Redmine::UiTest::Base
	21	fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
	22	:trackers, :projects_trackers, :enabled_modules,
	23	:custom_fields, :custom_values, :custom_fields_trackers
	24
	25	def test_reordering_should_redirect_to_index
	26	assert_equal 1, UserCustomField.find(4).position
	27	log_user 'admin', 'admin'
	28	visit '/custom_fields'
	29
	30	# click 'User' tab
	31	page.first('a#tab-UserCustomField').click
	32	# click 'Move down' link on the first row
	33	page.first('td.reorder a:nth-child(3)').click
	34
	35	assert_equal "/custom_fields?tab=UserCustomField", URI.parse(current_url).request_uri
	36	assert_equal 2, UserCustomField.find(4).position
	37	end
	38	end

app/controllers/custom_fields_controller.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2015  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class CustomFieldsController < ApplicationController
               layout 'admin'
               before_filter :require_admin
               before_filter :build_new_custom_field, :only => [:new, :create]
               before_filter :find_custom_field, :only => [:edit, :update, :destroy]
               accept_api_auth :index
               def index
                 respond_to do |format|
                   format.html {
                     @custom_fields_by_type = CustomField.all.group_by {|f| f.class.name }
                   }
                   format.api {
                     @custom_fields = CustomField.all
                   }
                 end
               end
               def new
                 @custom_field.field_format = 'string' if @custom_field.field_format.blank?
                 @custom_field.default_value = nil
               end
               def create
                 if @custom_field.save
                   flash[:notice] = l(:notice_successful_create)
                   call_hook(:controller_custom_fields_new_after_save, :params => params, :custom_field => @custom_field)
                   redirect_to edit_custom_field_path(@custom_field)
                 else
                   render :action => 'new'
                 end
               end
               def edit
               end
               def update
                 if @custom_field.update_attributes(params[:custom_field])
                   flash[:notice] = l(:notice_successful_update)
                   call_hook(:controller_custom_fields_edit_after_save, :params => params, :custom_field => @custom_field)
-                  redirect_to edit_custom_field_path(@custom_field)
+                  redirect_back_or_default edit_custom_field_path(@custom_field)
                 else
                   render :action => 'edit'
                 end
               end
               def destroy
                 begin
                   @custom_field.destroy
                 rescue
                   flash[:error] = l(:error_can_not_delete_custom_field)
                 end
                 redirect_to custom_fields_path(:tab => @custom_field.class.name)
               end
               private
               def build_new_custom_field
                 @custom_field = CustomField.new_subclass_instance(params[:type], params[:custom_field])
                 if @custom_field.nil?
                   render :action => 'select_type'
                 end
               end
               def find_custom_field
                 @custom_field = CustomField.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/views/custom_fields/_index.html.erb +2 -1

             <table class="list">
               <thead><tr>
                 <th><%=l(:field_name)%></th>
                 <th><%=l(:field_field_format)%></th>
                 <th><%=l(:field_is_required)%></th>
                 <% if tab[:name] == 'IssueCustomField' %>
                   <th><%=l(:field_is_for_all)%></th>
                   <th><%=l(:label_used_by)%></th>
                 <% end %>
                 <th><%=l(:button_sort)%></th>
                 <th></th>
               </tr></thead>
               <tbody>
               <% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%>
+                <% back_url = custom_fields_path(:tab => tab[:name]) %>
                 <tr class="<%= cycle("odd", "even") %>">
                   <td class="name"><%= link_to custom_field.name, edit_custom_field_path(custom_field) %></td>
                   <td><%= l(custom_field.format.label) %></td>
                   <td><%= checked_image custom_field.is_required? %></td>
                   <% if tab[:name] == 'IssueCustomField' %>
                   <td><%= checked_image custom_field.is_for_all? %></td>
                   <td><%= l(:label_x_projects, :count => custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %></td>
                   <% end %>
-                  <td class="reorder"><%= reorder_links('custom_field', {:action => 'update', :id => custom_field}, :put) %></td>
+                  <td class="reorder"><%= reorder_links('custom_field', {:action => 'update', :id => custom_field, :back_url => back_url}, :put) %></td>
                   <td class="buttons">
                     <%= delete_link custom_field_path(custom_field) %>
                   </td>
                 </tr>
               <% end; reset_cycle %>
               </tbody>
             </table>

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