Merge branch 'bugfix'

munkireport · Feb 2, 2015 · cba6b60 · cba6b60
2 parents a262ccf + 1bec9b6
commit cba6b60
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/migrations/machine_model/004_machine_osversion_integer.php b/app/migrations/machine_model/004_machine_osversion_integer.php
@@ -71,7 +71,7 @@ public function up()
 		  			$sql = "SELECT sql FROM sqlite_master WHERE type='table' AND name='machine'";
 		  			foreach($dbh->query($sql) as $arr)
 		  			{
-		  				$sql = preg_replace('/os_version[^V]* VARCHAR\(255\)/', 'os_version INT', $arr['sql'], 1, $changed);
+		  				$sql = preg_replace('/`os_version` VARCHAR\(255\)/', '`os_version` INT', $arr['sql'], 1, $changed);
 		  				if( ! $changed)
 		  				{
 		  					throw new Exception('Could not create temporary table as machine table is in an unknown state.');

diff --git a/assets/js/munkireport.js b/assets/js/munkireport.js
@@ -33,9 +33,15 @@ $( document ).ready(function() {
 function integer_to_version(osvers)
 {
 	osvers = "" + osvers
-	if( osvers !== '' && osvers.indexOf(".") == -1)
+	// If osvers contains a dot, don't convert
+	if( osvers.indexOf(".") == -1)
     {
-      osvers = osvers.match(/.{2}/g).map(function(x){return +x}).join('.')
+		// Remove non-numerical string
+		osvers = isNaN(osvers) ? "" : osvers;
+
+		// Left pad with zeroes if necessary
+		osvers = ("000000" + osvers).substr(-6)
+		osvers = osvers.match(/.{2}/g).map(function(x){return +x}).join('.')
     }
     return osvers
 }