projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 5190-no-hyphens-in-repo-names
[arvados.git]
/
apps
/
workbench
/
app
/
controllers
/
projects_controller.rb
diff --git
a/apps/workbench/app/controllers/projects_controller.rb
b/apps/workbench/app/controllers/projects_controller.rb
index 978395140b28d27ce84b02371eaf30620a5de135..3302771814eb3bc217f72c2e0aa5768e932dc65e 100644
(file)
--- a/
apps/workbench/app/controllers/projects_controller.rb
+++ b/
apps/workbench/app/controllers/projects_controller.rb
@@
-1,6
+1,9
@@
class ProjectsController < ApplicationController
before_filter :set_share_links, if: -> { defined? @object }
class ProjectsController < ApplicationController
before_filter :set_share_links, if: -> { defined? @object }
- skip_around_filter :require_thread_api_token, only: [:show, :tab_counts]
+ skip_around_filter :require_thread_api_token, if: proc { |ctrl|
+ Rails.configuration.anonymous_user_token and
+ %w(show tab_counts).include? ctrl.action_name
+ }
def model_class
Group
def model_class
Group
@@
-40,6
+43,9
@@
class ProjectsController < ApplicationController
# It also seems to me that something like these could be used to configure the contents of the panes.
def show_pane_list
pane_list = []
# It also seems to me that something like these could be used to configure the contents of the panes.
def show_pane_list
pane_list = []
+ if @object.uuid != current_user.andand.uuid
+ pane_list << 'Description'
+ end
pane_list <<
{
:name => 'Data_collections',
pane_list <<
{
:name => 'Data_collections',
@@
-154,7
+160,7
@@
class ProjectsController < ApplicationController
object.destroy
end
end
object.destroy
end
end
- while (objects = @object.contents
(include_linked: false)
).any?
+ while (objects = @object.contents).any?
objects.each do |object|
object.update_attributes! owner_uuid: current_user.uuid
end
objects.each do |object|
object.update_attributes! owner_uuid: current_user.uuid
end
@@
-195,7
+201,6
@@
class ProjectsController < ApplicationController
(val.is_a?(Array) ? val : [val]).each do |type|
objects = @object.contents(order: @order,
limit: @limit,
(val.is_a?(Array) ? val : [val]).each do |type|
objects = @object.contents(order: @order,
limit: @limit,
- include_linked: true,
filters: (@filters - kind_filters + [['uuid', 'is_a', type]]),
)
objects.each do |object|
filters: (@filters - kind_filters + [['uuid', 'is_a', type]]),
)
objects.each do |object|
@@
-233,7
+238,6
@@
class ProjectsController < ApplicationController
else
@objects = @object.contents(order: @order,
limit: @limit,
else
@objects = @object.contents(order: @order,
limit: @limit,
- include_linked: true,
filters: @filters,
offset: @offset)
@next_page_href = next_page_href(partial: :contents_rows,
filters: @filters,
offset: @offset)
@next_page_href = next_page_href(partial: :contents_rows,