[myexperiment-hackers] [3740] branches/packs/app: added error message for non-working checklist run

[noreply]

Revision

3740

Author

dgc

Date

2013-10-04 13:36:29 +0000 (Fri, 04 Oct 2013)

Log Message

added error message for non-working checklist run

Modified Paths

• branches/packs/app/controllers/packs_controller.rb
• branches/packs/app/models/research_object.rb
• branches/packs/app/views/errors/500.html.erb

Diff

Modified: branches/packs/app/controllers/packs_controller.rb (3739 => 3740)

--- branches/packs/app/controllers/packs_controller.rb	2013-10-01 15:02:06 UTC (rev 3739)
+++ branches/packs/app/controllers/packs_controller.rb	2013-10-04 13:36:29 UTC (rev 3740)
@@ -482,7 +482,12 @@
       return
     end
 
-    checklist = @pack.research_object.run_checklist!(slug)
+    begin
+      checklist = @pack.research_object.run_checklist!(slug)
+    rescue
+      render_500("A problem occured with the checklist service.")
+      return
+    end
 
     @pack.solr_index if Conf.solr_enable
     @pack.update_contribution_rank

Modified: branches/packs/app/models/research_object.rb (3739 => 3740)

--- branches/packs/app/models/research_object.rb	2013-10-01 15:02:06 UTC (rev 3739)
+++ branches/packs/app/models/research_object.rb	2013-10-04 13:36:29 UTC (rev 3740)
@@ -816,7 +816,7 @@
     entry = Conf.research_object_checklists[slug]
 
     if checklist.nil?
-      checklist = checklists.create(
+      checklist = checklists.new(
           :slug => slug,
           :label => entry["label"],
           :minim_url => entry["minim"],
@@ -825,6 +825,8 @@
 
     checklist.run_checklist!
 
+    checklist.save
+
     checklist
   end
 
@@ -872,6 +874,8 @@
       options = parameter["options"]
     elsif parameter["special"] == "wfprov_workflow_run"
       options = wfprov_workflow_run(self)
+    elsif parameter["special"] == "wfdesc_workflow"
+      options = wfprov_workflow_run(self)
     end
 
     return false unless options.find { |o| o[1] == node.to_s }

Modified: branches/packs/app/views/errors/500.html.erb (3739 => 3740)

--- branches/packs/app/views/errors/500.html.erb	2013-10-01 15:02:06 UTC (rev 3739)
+++ branches/packs/app/views/errors/500.html.erb	2013-10-04 13:36:29 UTC (rev 3740)
@@ -1,5 +1,10 @@
 <div class="error">
   <h1>500 - Internal Server Error</h1>
-  The server encountered an error whilst processing your request.<br/><br/>
-  The administrators have been notified of this problem.
-</div>
\ No newline at end of file
+  <% if @message %>
+    <%= @message %>
+  <% else %>
+    The server encountered an error whilst processing your request.
+    <br/><br/>
+    The administrators have been notified of this problem.
+  <% end %>
+</div>