Merge branch 'release/1.0' into develop

mongus · Aug 2, 2011 · 8e8d931 · 8e8d931
2 parents d131118 + 467644c
commit 8e8d931
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/assets/j/compiled/1009/site.js b/assets/j/compiled/1009/site.js
diff --git a/assets/j/plugins/call-and-sms-dialogs.js b/assets/j/plugins/call-and-sms-dialogs.js
@@ -223,7 +223,7 @@ $(function () {
 			clientDialNumber();
 		}
 		else {
-			deviceDialNumber(event);
+			deviceDialNumber(event, this);
 		}
 	};
 
@@ -236,13 +236,13 @@ $(function () {
 		$('.close', dialog).click();
 	};
 
-	var deviceDialNumber = function(event) {
+	var deviceDialNumber = function(event, clicked) {
 		$('.invoke-call-button span').text('Calling...');
 		$('.call-dialing').show();
 
-		var link = $(this).data('link');
+		var link = $(clicked).data('link');
 		$(this).prop('disabled', true);
-		var button = $(this);
+		var button = $(clicked);
 		$.ajax({
 			url : OpenVBX.home + '/messages/call',
 			data : $('form input, form select', dialog),

diff --git a/updates/49.php b/updates/49.php
@@ -10,7 +10,8 @@ function runUpdate_49() {
 		$ci->load->dbforge();
 		$ci->dbforge->add_column('users', array(
 			'online' => array(
-				'type' => 'TINYINT(1)',
+				'type' => 'TINYINT',
+				'constraint' => '1',
 				'default' => '9'
 			)
 		));