projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9b3c1e9
)
5261: Rename Summary tab to Description.
author
Tom Clegg <tom@curoverse.com>
Fri, 6 Mar 2015 18:05:10 +0000
(13:05 -0500)
committer
Tom Clegg <tom@curoverse.com>
Fri, 6 Mar 2015 18:05:10 +0000
(13:05 -0500)
apps/workbench/app/controllers/actions_controller.rb
patch
|
blob
|
history
apps/workbench/app/controllers/projects_controller.rb
patch
|
blob
|
history
apps/workbench/app/views/projects/_show_description.html.erb
[moved from
apps/workbench/app/views/projects/_show_summary.html.erb
with 100% similarity]
patch
|
blob
|
history
apps/workbench/test/integration/anonymous_access_test.rb
patch
|
blob
|
history
diff --git
a/apps/workbench/app/controllers/actions_controller.rb
b/apps/workbench/app/controllers/actions_controller.rb
index 7086dcdf3f4894ba57dcf8cae5e2f92711f750cf..84b62492b9208e529107af01ba54096b9c454f62 100644
(file)
--- a/
apps/workbench/app/controllers/actions_controller.rb
+++ b/
apps/workbench/app/controllers/actions_controller.rb
@@
-95,7
+95,7
@@
class ActionsController < ApplicationController
# the destination project.
redirect_to project_url(@object.uuid, anchor: 'Data_collections')
else
# the destination project.
redirect_to project_url(@object.uuid, anchor: 'Data_collections')
else
- # Otherwise just land on the default (
Summary
) tab.
+ # Otherwise just land on the default (
Description
) tab.
redirect_to @object
end
end
redirect_to @object
end
end
diff --git
a/apps/workbench/app/controllers/projects_controller.rb
b/apps/workbench/app/controllers/projects_controller.rb
index f00362187af3a10b2cef555e30d697e5623cfe50..3302771814eb3bc217f72c2e0aa5768e932dc65e 100644
(file)
--- a/
apps/workbench/app/controllers/projects_controller.rb
+++ b/
apps/workbench/app/controllers/projects_controller.rb
@@
-44,7
+44,7
@@
class ProjectsController < ApplicationController
def show_pane_list
pane_list = []
if @object.uuid != current_user.andand.uuid
def show_pane_list
pane_list = []
if @object.uuid != current_user.andand.uuid
- pane_list << '
Summary
'
+ pane_list << '
Description
'
end
pane_list <<
{
end
pane_list <<
{
diff --git
a/apps/workbench/app/views/projects/_show_summary.html.erb
b/apps/workbench/app/views/projects/_show_description.html.erb
similarity index 100%
rename from
apps/workbench/app/views/projects/_show_summary.html.erb
rename to
apps/workbench/app/views/projects/_show_description.html.erb
diff --git
a/apps/workbench/test/integration/anonymous_access_test.rb
b/apps/workbench/test/integration/anonymous_access_test.rb
index d81eb9f5cf4020029e36682627576acd732056cb..09e3330063a22bda1c4ced25ce9b75dd385000c3 100644
(file)
--- a/
apps/workbench/test/integration/anonymous_access_test.rb
+++ b/
apps/workbench/test/integration/anonymous_access_test.rb
@@
-55,7
+55,7
@@
class AnonymousAccessTest < ActionDispatch::IntegrationTest
test "selection actions when anonymous user accesses shared project" do
visit PUBLIC_PROJECT
test "selection actions when anonymous user accesses shared project" do
visit PUBLIC_PROJECT
- assert_selector 'a', text: '
Summary
'
+ assert_selector 'a', text: '
Description
'
assert_selector 'a', text: 'Data collections'
assert_selector 'a', text: 'Jobs and pipelines'
assert_selector 'a', text: 'Pipeline templates'
assert_selector 'a', text: 'Data collections'
assert_selector 'a', text: 'Jobs and pipelines'
assert_selector 'a', text: 'Pipeline templates'