From 848e39d6d4aef2406be70134d201943916c4b01d Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Mon, 1 Oct 2018 15:04:05 -0500 Subject: [PATCH] Better debug info if possible --- app/controllers/dunlop/ember/application_controller.rb | 10 +++++----- .../dunlop/ember/application/ember_path.html.slim | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/dunlop/ember/application_controller.rb b/app/controllers/dunlop/ember/application_controller.rb index f91d68e..621a73c 100644 --- a/app/controllers/dunlop/ember/application_controller.rb +++ b/app/controllers/dunlop/ember/application_controller.rb @@ -9,22 +9,22 @@ module Dunlop app_globals = {} if adapter_name = params[:adapter].to_s.scan(/\w+/).first.presence return render html: '403 - unauthorized, no adapter engine', status: 403 unless adapter = Panda.adapters[adapter_name] - app_index = Rails.root.join("public/adapters/#{adapter.url_name}/app/index.html") + @app_index = Rails.root.join("public/adapters/#{adapter.url_name}/app/index.html") #app_globals = adapter.settings # load through request instead. More stable then changing environments unless Rails.application.config.try(:loose_ember_app_authorization) return render html: '403 - unauthorized, no adapter engine permission', status: 403 unless current_user.admin? or can?(:read, adapter.engine) end else - app_index = Rails.root.join('public/app/index.html') + @app_index = Rails.root.join('public/app/index.html') end Rails.logger.info "Loading ember app for path '#/#{params[:rest]}' adapter: '#{params[:adapter].presence || 'main_app'}'" - if app_index.exist? - index_html = app_index.read.to_s + if @app_index.exist? + index_html = @app_index.read.to_s app_globals[:flash] = flash.to_h if flash.present? index_html.sub! 'app_globals={}', "app_globals=#{app_globals.to_json}" if app_globals.present? render html: index_html.html_safe else - render html: "App file #{app_index} not found".html_safe + render html: "App file #{@app_index.to_s} not found".html_safe end end diff --git a/app/views/dunlop/ember/application/ember_path.html.slim b/app/views/dunlop/ember/application/ember_path.html.slim index a12ef33..7ddd486 100644 --- a/app/views/dunlop/ember/application/ember_path.html.slim +++ b/app/views/dunlop/ember/application/ember_path.html.slim @@ -1,4 +1,4 @@ h3 span Could not find - tt= '/app/index.html' + tt= @app_index || '/app/index.html' span file