Merge pull request #190 from globaldyne/v11.6

V11.6
globaldyne · Oct 5, 2024 · 2713856 · 2713856
2 parents d8c83aa + 9eef1c5
commit 2713856
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
 # CHANGELOG
+### Version 11.6
+- Fix a bug incorrectly marking materials as banned in a formula
+- Fix a typo in db schema creation for new installations
+- Minor updates in sys-upgrade
+
 ### Version 11.5
 - Fix revisions comparison
 - Update logout script

diff --git a/VERSION.md b/VERSION.md
@@ -1 +1 @@
-11.5
+11.6
diff --git a/core/full_formula_data.php b/core/full_formula_data.php
@@ -226,7 +226,7 @@
 		}
 
 		$r['usage_regulator'] = 'PV';
-		$r['ingredient']['classification'] = (int)($ing_q['classification'] ?? 1);
+		$r['ingredient']['classification'] = (int)isset($ing_q['classification']) ?: 1;
 	}
 	if($ing_q['byPassIFRA'] === '0') {
 		$r['isIFRAbyPass'] = (int)0;

diff --git a/db/pvault.sql b/db/pvault.sql
@@ -235,7 +235,7 @@ CREATE TABLE `ingredients` (
   `molecularWeight` VARCHAR(255) NULL,
   `physical_state` INT NULL DEFAULT '1',
   `cid` INT NULL,
-  `shelf_life` INT NOT NULL DEFAULT '0'
+  `shelf_life` INT NOT NULL DEFAULT '0',
   `created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
 

diff --git a/db/schema.ver b/db/schema.ver
@@ -1 +1 @@
-11.5
+11.6
diff --git a/js/sys-upgrade.js b/js/sys-upgrade.js
@@ -9,14 +9,14 @@ $('#dbUpBtn').click(function() {
 		type: 'GET',
 		data: {
 			'do': "db_update"
-			},
+		},
 		dataType: 'json',
 		success: function (data) {
 			if(data.success) {
-				var msg = '<div class="alert alert-success">' + data.success + '</div>';
+				var msg = '<div class="alert alert-success"><i class="fa-solid fa-circle-exclamation mx-2"></i>' + data.success + '</div>';
 				$('#dbUpOk').show();
 			} else {
-				var msg = '<div class="alert alert-danger">' + data.error + '</div>';
+				var msg = '<div class="alert alert-danger"><i class="fa-solid fa-triangle-exclamation mx-2"></i>' + data.error + '</div>';
 				$('#dbUpBtn').show();
 				$('#dbBkBtn').show();
 				$('#dbUpOk').hide();
@@ -25,7 +25,7 @@ $('#dbUpBtn').click(function() {
 		},
 
 		error: function (request, status, error) {
-			$('#dbUpdMsg').html( '<div class="alert alert-danger">' + error + '</div>');
+			$('#dbUpdMsg').html( '<div class="alert alert-danger"><i class="fa-solid fa-triangle-exclamation mx-2"></i>' + error + '</div>');
 		},
   	});
 

diff --git a/pages/operations.php b/pages/operations.php
@@ -32,7 +32,7 @@
 		require_once($script);
 	}
   	if($c_ver == $n_ver){
-		$result['error'] = "No update is needed.";
+		$result['error'] = "No update is needed";
 		echo json_encode($result);
 		return;
     }
@@ -51,7 +51,7 @@
 	}
 
 	if($q){
-		$result['success'] = "<strong>Your database has been updated!</strong>";
+		$result['success'] = "Your database has been updated";
 		echo json_encode($result);
 	}
 

diff --git a/pages/views/formula/pendingMaterials.php b/pages/views/formula/pendingMaterials.php
@@ -49,7 +49,8 @@
 			loadingRecords: "&nbsp;",
 			processing: '<i class="fa fa-spinner fa-spin fa-3x fa-fw"></i>',
 			emptyTable: "No pending materials",
-			search: "Search:"
+			search: "",
+			searchPlaceholder: 'Search by formula, ingredient or CAS...',
 		},
     	ajax: {	url: "/core/list_pending_materials_data.php" },
 		columns: [

diff --git a/releasenotes.md b/releasenotes.md
@@ -1,6 +1,5 @@
-Whats New in v11.5
+Whats New in v11.6
 --------------------------
-- Improved filtering for advanced search in ingredients
-- UI updates for ingredients
-- Improve PV Online search
+- Fix a bug incorrectly marking materials as banned in a formula
+- Fix a bug preventing db creation for new installations
 - This release may include more changes, for full details please refer to the CHANGELOG