Merge branch 'develop'

modulargaming · Aug 1, 2014 · 6315269 · 6315269
2 parents 43b59ca + 73c4d3e
commit 6315269
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/assets/js/user.js b/assets/js/user.js
@@ -2,7 +2,7 @@ $(document).ready(function() {
 
 	// Typeahead for username.
 	$('.username-typeahead').typeahead({
-		'source': '/user/typeahead',
+		'source': config.base_url + 'user/typeahead',
 		'minLength': 3
 	});
 

diff --git a/templates/admin/user/role/index.mustache b/templates/admin/user/role/index.mustache
@@ -1,3 +1,5 @@
+<span class="hide" id="csrf">{{csrf}}</span>
+
 <table cellpadding="0" cellspacing="0" border="0" class="table table-bordered table-striped" id="data-table">
 	<thead>
 		<tr>
@@ -38,7 +40,7 @@
 	<div class="modal-body">
 		<form class="form-horizontal" id="modal-crud-form">		
 			<input type="hidden" name="id" value="" id="input-id" />
-				<input type="hidden" name="csrf" value="" />					
+				<input type="hidden" name="csrf" value="{{csrf}}" />					
 			<div class="control-group">
 				<label class="control-label" for="input-name">Name</label>