Merge pull request #12463 from Jaganathancse/refactor_tagging_edit

Refactor Changes- Removed duplicate code in tagging_edit_tags_reset
ManageIQ · Nov 27, 2016 · 578f896 · 578f896
2 parents 8b53948 + b6abfc0
commit 578f896
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/app/controllers/application_controller/tags.rb b/app/controllers/application_controller/tags.rb
@@ -148,14 +148,11 @@ def tagging_edit_tags_reset
     get_tag_items if @explorer
     @object_ids = session[:tag_items]
     @sb[:rec_id] = params[:id] ? params[:id] : session[:tag_items][0]
+    @tagging = session[:tag_db].to_s
     if params[:button] == "reset"
-      @tagging = session[:tag_db].to_s
       id = params[:id] if params[:id]
       return unless load_edit("#{session[:tag_db]}_edit_tags__#{id}")
       @object_ids = @edit[:object_ids]
-    else
-      # @object_ids[0] = params[:id] if @object_ids.blank? && params[:id]
-      @tagging = session[:tag_db].to_s
     end
     tagging_tags_set_form_vars
     @display   = nil