diff app/controllers/custom_fields_controller.rb @ 511:107d36338b70 live

Merge from branch "cannam"

--- a/app/controllers/custom_fields_controller.rb	Thu Jun 09 16:51:06 2011 +0100
+++ b/app/controllers/custom_fields_controller.rb	Thu Jul 14 10:43:07 2011 +0100
@@ -38,8 +38,9 @@
       flash[:notice] = l(:notice_successful_create)
       call_hook(:controller_custom_fields_new_after_save, :params => params, :custom_field => @custom_field)
       redirect_to :action => 'index', :tab => @custom_field.class.name
+    else
+      @trackers = Tracker.find(:all, :order => 'position')
     end
-    @trackers = Tracker.find(:all, :order => 'position')
   end
 
   def edit
@@ -48,8 +49,9 @@
       flash[:notice] = l(:notice_successful_update)
       call_hook(:controller_custom_fields_edit_after_save, :params => params, :custom_field => @custom_field)
       redirect_to :action => 'index', :tab => @custom_field.class.name
+    else
+      @trackers = Tracker.find(:all, :order => 'position')
     end
-    @trackers = Tracker.find(:all, :order => 'position')
   end
   
   def destroy