From 0300306e1d41a97510970fb22998e9d095b9caf2 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sat, 15 Feb 2014 04:22:48 +0000 Subject: [PATCH] * VRFS-1130 - found issue where postback wasn't using ENV['RAILS_RELATIVE_URL_ROOT'] --- admin/app/views/admin/recordings/_form.html.haml | 2 +- admin/config/application.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/app/views/admin/recordings/_form.html.haml b/admin/app/views/admin/recordings/_form.html.haml index 8d172f364..880f26823 100644 --- a/admin/app/views/admin/recordings/_form.html.haml +++ b/admin/app/views/admin/recordings/_form.html.haml @@ -14,7 +14,7 @@ %h3 Validations %p It should not be possible to create an invalid recording/track/mix/claim; there are a great deal of validations that will prevent you from doing something invalid. If you find otherwise, please fill out a JIRA . -= semantic_form_for([:admin, @recording], :html => {:multipart => true}, :url => @recording.new_record? ? admin_recordings_path : "/admin/recordings/#{@recording.id}") do |f| += semantic_form_for([:admin, @recording], :html => {:multipart => true}, :url => @recording.new_record? ? admin_recordings_path : "#{ENV['RAILS_RELATIVE_URL_ROOT']}/admin/recordings/#{@recording.id}") do |f| = f.semantic_errors *f.object.errors.keys = f.inputs name: 'Recording Fields' do diff --git a/admin/config/application.rb b/admin/config/application.rb index 48690b907..0ae29cd8e 100644 --- a/admin/config/application.rb +++ b/admin/config/application.rb @@ -36,7 +36,7 @@ module JamAdmin # Activate observers that should always be running. config.active_record.observers = "JamRuby::InvitedUserObserver" - #config.assets.prefix = ENV['RAILS_RELATIVE_URL_ROOT'] || '/' + config.assets.prefix = "#{ENV['RAILS_RELATIVE_URL_ROOT']}/assets" # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.