Merge pull request #4888 from jlsherrill/8598

fixes #8598 - fixing repository delete
Katello · Dec 19, 2014 · 0231cdd · 0231cdd
2 parents de464a7 + 0b489b5
commit 0231cdd
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/app/lib/actions/katello/repository/destroy.rb b/app/lib/actions/katello/repository/destroy.rb
@@ -32,12 +32,15 @@ def plan(repository, options = {})
           if !skip_environment_update && ::Katello.config.use_cp && view_env
             plan_action(ContentView::UpdateEnvironment, repository.content_view, repository.environment)
           end
-          plan_self
+          plan_self(:user_id => ::User.current.id)
         end
 
         def finalize
+          ::User.current = ::User.find(input[:user_id])
           repository = ::Katello::Repository.find(input[:repository][:id])
           repository.destroy!
+        ensure
+          ::User.current = nil
         end
 
         def humanized_name