projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d68cb18
)
Small naming fix for the config variables.
author
Ward Vandewege <ward@curoverse.com>
Sat, 8 Oct 2016 15:24:35 +0000
(11:24 -0400)
committer
Ward Vandewege <ward@curoverse.com>
Sat, 8 Oct 2016 15:57:29 +0000
(11:57 -0400)
refs #10078
apps/workbench/app/controllers/application_controller.rb
patch
|
blob
|
history
apps/workbench/app/views/projects/_show_dashboard.html.erb
patch
|
blob
|
history
apps/workbench/config/application.default.yml
patch
|
blob
|
history
diff --git
a/apps/workbench/app/controllers/application_controller.rb
b/apps/workbench/app/controllers/application_controller.rb
index 5b3f3f59ecebaf1c3b93efbe06509804e3dfa9f1..3b6c89ec0ef03d09c7b4565c88e59eb7c39f2ae1 100644
(file)
--- 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
helper_method :user_notifications
def user_notifications
- return [] if @errors or not current_user.andand.is_active or not Rails.configuration.show_user_notifications_
i
n_dashboard
+ return [] if @errors or not current_user.andand.is_active or not Rails.configuration.show_user_notifications_
o
n_dashboard
@notifications ||= @@notification_tests.map do |t|
t.call(self, current_user)
end.compact
@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 873d4f3f703da8557349de635723a8dcfecb7212..e0093bf6de320a3aacd471e8dbc3c4128983aed5 100644
(file)
--- 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
collection_pdhs = outputs.select {|x| !(m = CollectionsHelper.match(x)).nil?}.uniq.compact
collection_uuids = outputs - collection_pdhs
- if Rails.configuration.show_recent_collections_
i
n_dashboard
+ if Rails.configuration.show_recent_collections_
o
n_dashboard
recent_cs = recent_collections(8)
collection_uuids = collection_uuids + recent_cs[:collections].collect {|c| c.uuid}
collection_uuids.flatten.uniq
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>
</div>
</div>
</div>
- <% if Rails.configuration.show_recent_collections_
i
n_dashboard %>
+ <% if Rails.configuration.show_recent_collections_
o
n_dashboard %>
<div class="panel panel-default">
<div class="panel-heading"><span class="panel-title">Recent collections</span>
<span class="pull-right">
<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 95b178448b72bc4b26c967ce69df1ff4abfee98d..ed2683d81aaebf99e2fab1afd8ce8b9785723500 100644
(file)
--- 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
# 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_
i
n_dashboard: true
- show_user_notifications_
i
n_dashboard: true
+ show_recent_collections_
o
n_dashboard: true
+ show_user_notifications_
o
n_dashboard: true