projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 4523-full-text-search
[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 a0bf262c960384a58e11d34d5949be5b7dc60a38..abba785f07247723d6a58439acf923b37390334e 100644
(file)
--- a/
apps/workbench/app/controllers/projects_controller.rb
+++ b/
apps/workbench/app/controllers/projects_controller.rb
@@
-1,5
+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, 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
@@
-38,27
+42,32
@@
class ProjectsController < ApplicationController
# us to tell the interface to get counts for each pane (using :filters).
# It also seems to me that something like these could be used to configure the contents of the panes.
def show_pane_list
# us to tell the interface to get counts for each pane (using :filters).
# 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 = [
+ pane_list = []
+ pane_list <<
{
:name => 'Data_collections',
:filters => [%w(uuid is_a arvados#collection)]
{
:name => 'Data_collections',
:filters => [%w(uuid is_a arvados#collection)]
- },
+ }
+ pane_list <<
{
:name => 'Jobs_and_pipelines',
:filters => [%w(uuid is_a) + [%w(arvados#job arvados#pipelineInstance)]]
{
:name => 'Jobs_and_pipelines',
:filters => [%w(uuid is_a) + [%w(arvados#job arvados#pipelineInstance)]]
- },
+ }
+ pane_list <<
{
:name => 'Pipeline_templates',
:filters => [%w(uuid is_a arvados#pipelineTemplate)]
{
:name => 'Pipeline_templates',
:filters => [%w(uuid is_a arvados#pipelineTemplate)]
- },
+ }
+ pane_list <<
{
:name => 'Subprojects',
:filters => [%w(uuid is_a arvados#group)]
{
:name => 'Subprojects',
:filters => [%w(uuid is_a arvados#group)]
- },
- { :name => 'Other_objects',
+ } if current_user
+ pane_list <<
+ {
+ :name => 'Other_objects',
:filters => [%w(uuid is_a) + [%w(arvados#human arvados#specimen arvados#trait)]]
:filters => [%w(uuid is_a) + [%w(arvados#human arvados#specimen arvados#trait)]]
- }
- ]
+ } if current_user
pane_list << { :name => 'Sharing',
:count => @share_links.count } if @user_is_manager
pane_list << { :name => 'Advanced' }
pane_list << { :name => 'Sharing',
:count => @share_links.count } if @user_is_manager
pane_list << { :name => 'Advanced' }
@@
-111,7
+120,13
@@
class ProjectsController < ApplicationController
@removed_uuids << link.uuid
link.destroy
end
@removed_uuids << link.uuid
link.destroy
end
- if item.owner_uuid == @object.uuid
+
+ # If this object has the 'expires_at' attribute, then simply mark it
+ # expired.
+ if item.attributes.include?("expires_at")
+ item.update_attributes expires_at: Time.now
+ @removed_uuids << item.uuid
+ elsif item.owner_uuid == @object.uuid
# Object is owned by this project. Remove it from the project by
# changing owner to the current user.
begin
# Object is owned by this project. Remove it from the project by
# changing owner to the current user.
begin