From f9076c0f63af8f560bba590a9a8aac81640edc85 Mon Sep 17 00:00:00 2001 From: JB Date: Sat, 28 Sep 2024 14:20:05 +0100 Subject: [PATCH 1/4] [b9e0ea6] - v11.6 --- CHANGELOG.md | 2 ++ VERSION.md | 2 +- db/schema.ver | 2 +- releasenotes.md | 5 +---- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45c1a7cf..9aee157b 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ # CHANGELOG +### Version 11.6 + ### Version 11.5 - Fix revisions comparison - Update logout script diff --git a/VERSION.md b/VERSION.md index 8204473e..1ed6da4f 100755 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -11.5 +11.6 diff --git a/db/schema.ver b/db/schema.ver index 8204473e..1ed6da4f 100644 --- a/db/schema.ver +++ b/db/schema.ver @@ -1 +1 @@ -11.5 +11.6 diff --git a/releasenotes.md b/releasenotes.md index f2bb278b..8992f4a5 100755 --- a/releasenotes.md +++ b/releasenotes.md @@ -1,6 +1,3 @@ -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 - This release may include more changes, for full details please refer to the CHANGELOG From ab185f931222171f7764516f30eb485b6cf378d6 Mon Sep 17 00:00:00 2001 From: JB Date: Sun, 29 Sep 2024 12:21:00 +0100 Subject: [PATCH 2/4] [f9076c0] - Minor updates in sys-upgrade --- CHANGELOG.md | 1 + js/sys-upgrade.js | 8 ++++---- pages/operations.php | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9aee157b..d2c84525 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # CHANGELOG ### Version 11.6 +- Minor updates in sys-upgrade ### Version 11.5 - Fix revisions comparison diff --git a/js/sys-upgrade.js b/js/sys-upgrade.js index f0522762..2fe933c3 100644 --- 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 = '
' + data.success + '
'; + var msg = '
' + data.success + '
'; $('#dbUpOk').show(); } else { - var msg = '
' + data.error + '
'; + var msg = '
' + data.error + '
'; $('#dbUpBtn').show(); $('#dbBkBtn').show(); $('#dbUpOk').hide(); @@ -25,7 +25,7 @@ $('#dbUpBtn').click(function() { }, error: function (request, status, error) { - $('#dbUpdMsg').html( '
' + error + '
'); + $('#dbUpdMsg').html( '
' + error + '
'); }, }); diff --git a/pages/operations.php b/pages/operations.php index 72d65dd2..d9d41809 100644 --- 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'] = "Your database has been updated!"; + $result['success'] = "Your database has been updated"; echo json_encode($result); } From 8b44679b82cd167c95de2fd7d259299f086f11e6 Mon Sep 17 00:00:00 2001 From: JB Date: Thu, 3 Oct 2024 15:03:19 +0100 Subject: [PATCH 3/4] [ab185f9] - Fix db schema - Add a search box placeholder for pending materials --- CHANGELOG.md | 1 + db/pvault.sql | 2 +- pages/views/formula/pendingMaterials.php | 3 ++- releasenotes.md | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2c84525..47259b0c 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # CHANGELOG ### Version 11.6 +- Fix a typo in db schema creation for new installations - Minor updates in sys-upgrade ### Version 11.5 diff --git a/db/pvault.sql b/db/pvault.sql index aaf261fd..8d763a3e 100755 --- 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/pages/views/formula/pendingMaterials.php b/pages/views/formula/pendingMaterials.php index ec3a9654..bcf7d5df 100644 --- a/pages/views/formula/pendingMaterials.php +++ b/pages/views/formula/pendingMaterials.php @@ -49,7 +49,8 @@ loadingRecords: " ", processing: '', 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 index 8992f4a5..3a831096 100755 --- a/releasenotes.md +++ b/releasenotes.md @@ -1,3 +1,4 @@ Whats New in v11.6 -------------------------- +- Fix a bug preventing db creation for new installations - This release may include more changes, for full details please refer to the CHANGELOG From 9eef1c56c73c8cd67d4985cd8b7cabd8bfa87682 Mon Sep 17 00:00:00 2001 From: JB Date: Sat, 5 Oct 2024 12:02:00 +0100 Subject: [PATCH 4/4] [8b44679] - Fix a bug incorrectly marking materials as banned in a formula --- CHANGELOG.md | 1 + core/full_formula_data.php | 2 +- releasenotes.md | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47259b0c..4c7ce271 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # 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 diff --git a/core/full_formula_data.php b/core/full_formula_data.php index 54fb8670..6f31d715 100644 --- 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/releasenotes.md b/releasenotes.md index 3a831096..d82e651c 100755 --- a/releasenotes.md +++ b/releasenotes.md @@ -1,4 +1,5 @@ Whats New in v11.6 -------------------------- +- 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