[ARVADOS] updated: f853c2c7f2283b57a4f215aeb288b2842e3d1843

[Git user]

Summary of changes:
 apps/workbench/app/controllers/application_controller.rb   | 2 +-
 apps/workbench/app/views/projects/_show_dashboard.html.erb | 4 ++--
 apps/workbench/config/application.default.yml              | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

       via  f853c2c7f2283b57a4f215aeb288b2842e3d1843 (commit)
      from  d68cb1845e82f44ecf126ae4fd1ba3abc00f4463 (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 f853c2c7f2283b57a4f215aeb288b2842e3d1843
Author: Ward Vandewege <ward at curoverse.com>
Date:   Sat Oct 8 11:24:35 2016 -0400

    Small naming fix for the config variables.
    
    refs #10078

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 5b3f3f5..3b6c89e 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -769,7 +769,7 @@ class ApplicationController < ActionController::Base
 
   helper_method :user_notifications
   def user_notifications
-    return [] if @errors or not current_user.andand.is_active or not Rails.configuration.show_user_notifications_in_dashboard
+    return [] if @errors or not current_user.andand.is_active or not Rails.configuration.show_user_notifications_on_dashboard
     @notifications ||= @@notification_tests.map do |t|
       t.call(self, current_user)
     end.compact
diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb
index 873d4f3..e0093bf 100644
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -13,7 +13,7 @@
   collection_pdhs = outputs.select {|x| !(m = CollectionsHelper.match(x)).nil?}.uniq.compact
   collection_uuids = outputs - collection_pdhs
 
-  if Rails.configuration.show_recent_collections_in_dashboard
+  if Rails.configuration.show_recent_collections_on_dashboard
     recent_cs = recent_collections(8)
     collection_uuids = collection_uuids + recent_cs[:collections].collect {|c| c.uuid}
     collection_uuids.flatten.uniq
@@ -163,7 +163,7 @@
           </div>
         </div>
       </div>
-      <% if Rails.configuration.show_recent_collections_in_dashboard %>
+      <% if Rails.configuration.show_recent_collections_on_dashboard %>
       <div class="panel panel-default">
         <div class="panel-heading"><span class="panel-title">Recent collections</span>
           <span class="pull-right">
diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 95b1784..ed2683d 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -284,5 +284,5 @@ common:
   # In systems with many shared projects, dashboard loading can be
   # slow due to collections indexing; use the following parameters
   # to suppress certain properties from dashboard
-  show_recent_collections_in_dashboard: true
-  show_user_notifications_in_dashboard: true
+  show_recent_collections_on_dashboard: true
+  show_user_notifications_on_dashboard: true

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


hooks/post-receive
--