comparison app/controllers/workflows_controller.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch

           assignee = options.is_a?(Array) && options.include?('assignee') && !options.include?('always')
           WorkflowTransition.create(:role_id => @role.id, :tracker_id => @tracker.id, :old_status_id => status_id, :new_status_id => new_status_id, :author => author, :assignee => assignee)
         }
       }
       if @role.save
+        flash[:notice] = l(:notice_successful_update)
         redirect_to workflows_edit_path(:role_id => @role, :tracker_id => @tracker, :used_statuses_only => params[:used_statuses_only])
         return
       end
     end
 

     @role = Role.find_by_id(params[:role_id]) if params[:role_id]
     @tracker = Tracker.find_by_id(params[:tracker_id]) if params[:tracker_id]
 
     if request.post? && @role && @tracker
       WorkflowPermission.replace_permissions(@tracker, @role, params[:permissions] || {})
+      flash[:notice] = l(:notice_successful_update)
       redirect_to workflows_permissions_path(:role_id => @role, :tracker_id => @tracker, :used_statuses_only => params[:used_statuses_only])
       return
     end
 
     @used_statuses_only = (params[:used_statuses_only] == '0' ? false : true)

     @statuses ||= IssueStatus.sorted.all
 
     if @role && @tracker
       @fields = (Tracker::CORE_FIELDS_ALL - @tracker.disabled_core_fields).map {|field| [field, l("field_"+field.sub(/_id$/, ''))]}
       @custom_fields = @tracker.custom_fields
-
-      @permissions = WorkflowPermission.where(:tracker_id => @tracker.id, :role_id => @role.id).all.inject({}) do |h, w|
+      @permissions = WorkflowPermission.
+          where(:tracker_id => @tracker.id, :role_id => @role.id).inject({}) do |h, w|
         h[w.old_status_id] ||= {}
         h[w.old_status_id][w.field_name] = w.rule
         h
       end
       @statuses.each {|status| @permissions[status.id] ||= {}}
     end
   end
 
   def copy
-
     if params[:source_tracker_id].blank? || params[:source_tracker_id] == 'any'
       @source_tracker = nil
     else
       @source_tracker = Tracker.find_by_id(params[:source_tracker_id].to_i)
     end
     if params[:source_role_id].blank? || params[:source_role_id] == 'any'
       @source_role = nil
     else
       @source_role = Role.find_by_id(params[:source_role_id].to_i)
     end
-
-    @target_trackers = params[:target_tracker_ids].blank? ? nil : Tracker.find_all_by_id(params[:target_tracker_ids])
-    @target_roles = params[:target_role_ids].blank? ? nil : Role.find_all_by_id(params[:target_role_ids])
-
+    @target_trackers = params[:target_tracker_ids].blank? ?
+        nil : Tracker.where(:id => params[:target_tracker_ids]).all
+    @target_roles = params[:target_role_ids].blank? ?
+        nil : Role.where(:id => params[:target_role_ids]).all
     if request.post?
       if params[:source_tracker_id].blank? || params[:source_role_id].blank? || (@source_tracker.nil? && @source_role.nil?)
         flash.now[:error] = l(:error_workflow_copy_source)
       elsif @target_trackers.blank? || @target_roles.blank?
         flash.now[:error] = l(:error_workflow_copy_target)