[webui] BsRequest::ModifyError is not an Activexml Error

openSUSE · Nov 20, 2012 · 88e1fa2 · 88e1fa2
1 parent 5b207b4
commit 88e1fa2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/api/script/start_test_backend b/src/api/script/start_test_backend
@@ -298,6 +298,8 @@ FileUtils.cp("#{Rails.root}/test/fixtures/backend/source/_pubkey", "#{Rails.root
 @http_user = nil
 User.current = nil
 
+scheduler_thread = nil
+
 at_exit do
   puts "kill #{srcsrv_out.pid}"
   Process.kill "TERM", -srcsrv_out.pid
@@ -308,7 +310,7 @@ at_exit do
   puts "kill #{publishsrv_out.pid}"
   Process.kill "TERM", -publishsrv_out.pid
 
-  scheduler_thread.join
+  scheduler_thread.join if scheduler_thread
   srcsrv_out.close
   srcsrv_out = nil
   srcsrv.join

diff --git a/src/webui/app/controllers/request_controller.rb b/src/webui/app/controllers/request_controller.rb
@@ -47,7 +47,7 @@ def modify_review
     begin
       BsRequest.modifyReview(opts[:id], opts[:new_review_state], opts)
     rescue BsRequest::ModifyError => e
-      flash[:error] = e.summary
+      flash[:error] = e.message
     end
     redirect_to :action => 'show', :id => opts[:id]
   end