* oomps--left in my local capybara-screenshot reference
This commit is contained in:
parent
e4ed571dcb
commit
73b04ba5fc
|
|
@ -91,7 +91,7 @@ if ENV['JAMWEB_QT5'] == '1'
|
|||
else
|
||||
gem "capybara-webkit"
|
||||
end
|
||||
gem 'capybara-screenshot', :path => '/Users/seth/workspace/capybara-screenshot'
|
||||
gem 'capybara-screenshot'
|
||||
gem 'cucumber-rails', :require => false #, '1.3.0', :require => false
|
||||
gem 'guard-spork', '0.3.2'
|
||||
gem 'spork', '0.9.0'
|
||||
|
|
|
|||
|
|
@ -8,11 +8,15 @@ class ApiRecordingsController < ApiController
|
|||
|
||||
@@log = Logging.logger[ApiRecordingsController]
|
||||
|
||||
def index
|
||||
# lists recordings created by for the current user
|
||||
@recordings = Recording.list_recordings(current_user, params[:created_by])
|
||||
end
|
||||
|
||||
# Returns all files this user should be uploading from his client
|
||||
def list_uploads
|
||||
begin
|
||||
result = Recording.list_uploads(current_user, params[:limit], params[:since])
|
||||
puts result.inspect
|
||||
render :json => result, :status => 200
|
||||
rescue
|
||||
render :json => { :message => "could not produce list of files" }, :status => 403
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
object @recordings
|
||||
|
||||
extends "api_recordings_sessions/show"
|
||||
Loading…
Reference in New Issue