diff --git a/web/Gemfile b/web/Gemfile index aa9fc6948..91f446324 100644 --- a/web/Gemfile +++ b/web/Gemfile @@ -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' diff --git a/web/app/controllers/api_recordings_controller.rb b/web/app/controllers/api_recordings_controller.rb index 6cdba007c..51aac0be0 100644 --- a/web/app/controllers/api_recordings_controller.rb +++ b/web/app/controllers/api_recordings_controller.rb @@ -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 diff --git a/web/app/views/api_recordings/index.rabl b/web/app/views/api_recordings/index.rabl new file mode 100644 index 000000000..524fe1792 --- /dev/null +++ b/web/app/views/api_recordings/index.rabl @@ -0,0 +1,3 @@ +object @recordings + +extends "api_recordings_sessions/show"