[ARVADOS] updated: a968b13628bbd34f5c217ffe3cfaab7615aa4eb5

git at public.curoverse.com git at public.curoverse.com
Thu Aug 14 16:07:44 EDT 2014


Summary of changes:
 apps/workbench/app/controllers/actions_controller.rb       |  3 +++
 .../app/views/application/_report_issue_popup.html.erb     |  4 ++--
 .../app/views/application/report_issue_popup.js.erb        |  2 +-
 .../app/views/issue_reporter/send_report.text.erb          |  4 +++-
 apps/workbench/test/functional/actions_controller_test.rb  |  2 +-
 apps/workbench/test/integration/application_layout_test.rb | 14 +++++++-------
 6 files changed, 17 insertions(+), 12 deletions(-)

       via  a968b13628bbd34f5c217ffe3cfaab7615aa4eb5 (commit)
       via  f8b650c589de9aa6a92c93089050fffc6aca7fab (commit)
       via  8bc1a5b6761d80bf1a6f0d2eb725fcdc30443981 (commit)
      from  d1c1d50d671e87f5fa5ad24904e7c18123835db9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit a968b13628bbd34f5c217ffe3cfaab7615aa4eb5
Author: radhika <radhika at curoverse.com>
Date:   Thu Aug 14 16:07:15 2014 -0400

    3112: minor label updates

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index e7feb25..695f770 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -186,7 +186,7 @@ class ActionsController < ApplicationController
   end
 
   def report_issue
-    puts "Issue being reported with these parameters: #{params.inspect}"
+    $stderr.puts "Issue being reported with these parameters: #{params.inspect}"
     logger.warn "Issue being reported with these parameters: #{params.inspect}"
 
     respond_to do |format|
diff --git a/apps/workbench/app/views/application/_report_issue_popup.html.erb b/apps/workbench/app/views/application/_report_issue_popup.html.erb
index e569933..31c76d0 100644
--- a/apps/workbench/app/views/application/_report_issue_popup.html.erb
+++ b/apps/workbench/app/views/application/_report_issue_popup.html.erb
@@ -82,7 +82,7 @@
           <div class="form-group">
             <label for="report_text_label" class="col-sm-4 control-label"> Found a problem? Tell us what happened </label>
             <div class="col-sm-8">
-              <textarea class="form-control" rows="1" name="report_text" type="text"/>
+              <textarea class="form-control" rows="1" id="report_issue_text" name="report_issue_text" type="text"/>
             </div>
           </div>
         <% end %>
diff --git a/apps/workbench/app/views/application/report_issue_popup.js.erb b/apps/workbench/app/views/application/report_issue_popup.js.erb
index 513bf7d..59aedbc 100644
--- a/apps/workbench/app/views/application/report_issue_popup.js.erb
+++ b/apps/workbench/app/views/application/report_issue_popup.js.erb
@@ -2,6 +2,6 @@ $("#report-issue-modal-window").html("<%= escape_javascript(render partial: 'rep
 
 // reset form input fields, for the next time around
 function reset_form() {
-  $('#report_text').val("");
+  $('#report_issue_text').val("");
   $('#additional_info').val("");
 }
diff --git a/apps/workbench/app/views/issue_reporter/send_report.text.erb b/apps/workbench/app/views/issue_reporter/send_report.text.erb
index 466d091..4cbb371 100644
--- a/apps/workbench/app/views/issue_reporter/send_report.text.erb
+++ b/apps/workbench/app/views/issue_reporter/send_report.text.erb
@@ -5,7 +5,9 @@ Issue reported
 <% end %>
 
 Details of the report:
+<% if @params['report_additional_info'] %>
 <% json_map = JSON.parse(@params['report_additional_info']).map %>
 <%  map_to_s = json_map.map {|k,v| "#{k}=#{v}"}.join("\n") %>
 <%= map_to_s %>
-Report text=<%=@params['report_text'] %>
+<% end %>
+Report text=<%=@params['report_issue_text'] %>
diff --git a/apps/workbench/test/functional/actions_controller_test.rb b/apps/workbench/test/functional/actions_controller_test.rb
index f3c7b74..9654538 100644
--- a/apps/workbench/test/functional/actions_controller_test.rb
+++ b/apps/workbench/test/functional/actions_controller_test.rb
@@ -8,7 +8,7 @@ class ActionsControllerTest < ActionController::TestCase
 
     found_email = false
     ActionMailer::Base.deliveries.andand.each do |email|
-      if email.subject == "Issue reported"
+      if email.subject.include? "Issue reported by admin"
         found_email = true
         break
       end
diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb
index 990bd7b..a4b30f2 100644
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -87,7 +87,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
       assert page.has_text? 'Workbench version'
       assert page.has_text? 'Arvados base'
       assert page.has_text? 'Additional info'
-      assert page.has_no_text? 'Report text'
+      assert page.has_no_text? 'Found a problem?'
       assert page.has_button? 'Close'
       assert page.has_no_button? 'Report issue'
       click_button 'Close'
@@ -109,13 +109,13 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
       assert page.has_text? 'Workbench version'
       assert page.has_text? 'Arvados base'
       assert page.has_text? 'Additional info'
-      assert page.has_text? 'Report text'
+      assert page.has_text? 'Found a problem?'
       assert page.has_no_button? 'Close'
       assert page.has_button? 'Report issue'
       assert page.has_button? 'Cancel'
 
       # enter a report text and click on report
-      page.find_field('report_text').set 'my test report text'
+      page.find_field('report_issue_text').set 'my test report text'
       click_button 'Report issue'
     end
 
@@ -280,12 +280,12 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
         assert page.has_no_text? 'Version / debugging info'
         assert page.has_text? 'Server version'
         assert page.has_text? 'Server restarted at'
-        assert page.has_text? 'Report text'
+        assert page.has_text? 'Found a problem?'
         assert page.has_button? 'Report issue'
         assert page.has_button? 'Cancel'
 
         # enter a report text and click on report
-        page.find_field('report_text').set 'my test report text'
+        page.find_field('report_issue_text').set 'my test report text'
         click_button 'Report issue'
       end
 

commit f8b650c589de9aa6a92c93089050fffc6aca7fab
Author: radhika <radhika at curoverse.com>
Date:   Thu Aug 14 15:12:17 2014 -0400

    3112: log when an issue is reported

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index a50eaaf..e7feb25 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -186,6 +186,9 @@ class ActionsController < ApplicationController
   end
 
   def report_issue
+    puts "Issue being reported with these parameters: #{params.inspect}"
+    logger.warn "Issue being reported with these parameters: #{params.inspect}"
+
     respond_to do |format|
       IssueReporter.send_report(current_user, params).deliver
       format.js
diff --git a/apps/workbench/app/views/application/_report_issue_popup.html.erb b/apps/workbench/app/views/application/_report_issue_popup.html.erb
index 4a56fde..e569933 100644
--- a/apps/workbench/app/views/application/_report_issue_popup.html.erb
+++ b/apps/workbench/app/views/application/_report_issue_popup.html.erb
@@ -80,7 +80,7 @@
 
         <% if @popup_params[:popup_type] == 'report' %>
           <div class="form-group">
-            <label for="report_text_label" class="col-sm-4 control-label"> Report text </label>
+            <label for="report_text_label" class="col-sm-4 control-label"> Found a problem? Tell us what happened </label>
             <div class="col-sm-8">
               <textarea class="form-control" rows="1" name="report_text" type="text"/>
             </div>

commit 8bc1a5b6761d80bf1a6f0d2eb725fcdc30443981
Author: radhika <radhika at curoverse.com>
Date:   Thu Aug 14 14:46:07 2014 -0400

    3112: trailing white spaces

diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb
index 5fe86cc..990bd7b 100644
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -74,7 +74,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
         assert page.has_link? 'Show version / debugging info'
         assert page.has_link? 'Report a problem'
 
-        # check show version info link      
+        # check show version info link
         click_link 'Show version / debugging info'
       end
     end
@@ -93,7 +93,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
       click_button 'Close'
     end
 
-    # check report issue link      
+    # check report issue link
     within('.navbar-fixed-top') do
       page.find("#arv-help").click
       within('.dropdown-menu') do

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list