projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5d5c69b
)
Fix "show all activity".
author
Tom Clegg <tom@curoverse.com>
Wed, 30 Apr 2014 20:56:18 +0000
(16:56 -0400)
committer
Tom Clegg <tom@curoverse.com>
Wed, 30 Apr 2014 20:56:18 +0000
(16:56 -0400)
apps/workbench/app/controllers/application_controller.rb
patch
|
blob
|
history
apps/workbench/app/models/log.rb
patch
|
blob
|
history
apps/workbench/app/views/folders/show.html.erb
patch
|
blob
|
history
apps/workbench/app/views/logs/show.html.erb
[deleted file]
patch
|
blob
|
history
diff --git
a/apps/workbench/app/controllers/application_controller.rb
b/apps/workbench/app/controllers/application_controller.rb
index 31f3464b0ce817373808bd1a3062c5ca647d6961..e9d4dd5a97fcaaf158161da9fa02147edfda267d 100644
(file)
--- a/
apps/workbench/app/controllers/application_controller.rb
+++ b/
apps/workbench/app/controllers/application_controller.rb
@@
-71,7
+71,16
@@
class ApplicationController < ActionController::Base
offset = 0
end
offset = 0
end
- @objects ||= model_class.limit(limit).offset(offset).all
+ if params[:filters]
+ filters = params[:filters]
+ if filters.is_a? String
+ filters = Oj.load filters
+ end
+ else
+ filters = []
+ end
+
+ @objects ||= model_class.filter(filters).limit(limit).offset(offset).all
respond_to do |f|
f.json { render json: @objects }
f.html { render }
respond_to do |f|
f.json { render json: @objects }
f.html { render }
diff --git
a/apps/workbench/app/models/log.rb
b/apps/workbench/app/models/log.rb
index c804bf7b7150a2df90796114d792f3970cbdae43..39d585bf90bb6f3aded909321a1e4a7652dec015 100644
(file)
--- a/
apps/workbench/app/models/log.rb
+++ b/
apps/workbench/app/models/log.rb
@@
-1,3
+1,8
@@
class Log < ArvadosBase
attr_accessor :object
class Log < ArvadosBase
attr_accessor :object
+ def self.creatable?
+ # Technically yes, but not worth offering: it will be empty, and
+ # you won't be able to edit it.
+ false
+ end
end
end
diff --git
a/apps/workbench/app/views/folders/show.html.erb
b/apps/workbench/app/views/folders/show.html.erb
index cc7a347d01ac84c9543c9cd807c72e39abfbac45..c7db5623526f79e05459e322590bfb75107c06cd 100644
(file)
--- a/
apps/workbench/app/views/folders/show.html.erb
+++ b/
apps/workbench/app/views/folders/show.html.erb
@@
-39,7
+39,7
@@
<% end %>
<% if @logs.any? %>
<%= link_to raw('Show all activity <i class="fa fa-hand-o-right"></i>'),
<% end %>
<% if @logs.any? %>
<%= link_to raw('Show all activity <i class="fa fa-hand-o-right"></i>'),
- logs_path(filters: [['object_uuid','=',@object.uuid]]),
+ logs_path(filters: [['object_uuid','=',@object.uuid]]
.to_json
),
class: 'btn btn-sm btn-info' %>
<% else %>
<p>
class: 'btn btn-sm btn-info' %>
<% else %>
<p>
diff --git
a/apps/workbench/app/views/logs/show.html.erb
b/apps/workbench/app/views/logs/show.html.erb
deleted file mode 100644
(file)
index
9079085
..0000000
--- a/
apps/workbench/app/views/logs/show.html.erb
+++ /dev/null
@@
-1
+0,0 @@
-<%= render :partial => 'application/arvados_object' %>