Merge pull request #986 from ucfcdl/issue/985-alert-modal-in-lti-picker

Sitewide alert no longer renders erroneously in LTI success screen.
ucfopen · Feb 23, 2017 · 6ccab50 · 6ccab50
2 parents efbfd4c + 7403e2d
commit 6ccab50
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/fuel/app/modules/lti/classes/controller/error.php b/fuel/app/modules/lti/classes/controller/error.php
@@ -32,7 +32,10 @@ public function after($response)
 			\Js::push_inline($this->theme->view('partials/google_analytics', array('id' => $gid)));
 		}
 
-		\Js::push_group('core');
+		\Js::push_group(['core', 'angular', 'ng_modal', 'materia']);
+		\Js::push_inline('var BASE_URL = "'.\Uri::base().'";');
+		\Js::push_inline('var STATIC_CROSSDOMAIN = "'.\Config::get('materia.urls.static_crossdomain').'";');
+
 		\Css::push_group('lti');
 
 		return \Response::forge(\Theme::instance()->render());

diff --git a/fuel/app/modules/lti/classes/controller/lti.php b/fuel/app/modules/lti/classes/controller/lti.php
@@ -87,6 +87,10 @@ public function action_success($inst_id)
 
 		$this->insert_analytics();
 
+		\Js::push_group(['angular', 'ng_modal', 'materia']);
+		\Js::push_inline('var BASE_URL = "'.\Uri::base().'";');
+		\Js::push_inline('var STATIC_CROSSDOMAIN = "'.\Config::get('materia.urls.static_crossdomain').'";');
+
 		\Css::push_group('lti');
 
 		return \Response::forge($this->theme->render());