From 4097665cb8e941a1f7e3e69f04dc82dfb278ef00 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Thu, 22 Mar 2018 16:57:05 +0100
Subject: [PATCH] [FEAT] #188 Database version string
---
.../Views/basket-administration.component.html | 2 +-
.../class/class_business_app_tools_Abstract.php | 8 +++-----
apps/maarch_entreprise/xml/database_version.xml | 2 +-
sql/data_fr.sql | 2 +-
sql/develop.sql | 2 ++
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/apps/maarch_entreprise/Views/basket-administration.component.html b/apps/maarch_entreprise/Views/basket-administration.component.html
index ed690a44c18..202a1800bf0 100644
--- a/apps/maarch_entreprise/Views/basket-administration.component.html
+++ b/apps/maarch_entreprise/Views/basket-administration.component.html
@@ -95,7 +95,7 @@
</ng-template>
<div class="col-md-6">
<mat-form-field style="margin-top:5px;">
- <mat-select id="actionPages" name="actionPages" placeholder="{{lang.resultPages}}" [(ngModel)]="group.result_page" (change)="updateResultPage(group)">
+ <mat-select id="actionPages" name="actionPages" placeholder="{{lang.resultPage}}" [(ngModel)]="group.result_page" (change)="updateResultPage(group)">
<mat-option *ngFor="let page of resultPages" [value]="page.id">
{{page.label}}
</mat-option>
diff --git a/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php b/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php
index 9aee01393f9..bc8398f5613 100755
--- a/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php
+++ b/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php
@@ -628,7 +628,7 @@ abstract class business_app_tools_Abstract extends Database
$_SESSION['maarch_entreprise']['xml_versionbase'] = 'none';
}
$checkBase = new Database();
- $query = "SELECT param_value_int, param_value_string FROM " . PARAM_TABLE
+ $query = "SELECT param_value_string FROM " . PARAM_TABLE
. " WHERE id = 'database_version'";
$stmt = $checkBase->query($query); //Find value in parameters table on database
@@ -636,10 +636,8 @@ abstract class business_app_tools_Abstract extends Database
$_SESSION['maarch_entreprise']['database_version'] = "none";
} else {
$vbg = $stmt->fetchObject();
- $_SESSION['maarch_entreprise']
- ['database_version'] = $vbg->param_value_int;
- $_SESSION['maarch_entreprise']
- ['database_version_minor'] = $vbg->param_value_string;
+ $_SESSION['maarch_entreprise']['database_version'] = $vbg->param_value_string;
+ $_SESSION['maarch_entreprise']['database_version_minor'] = $vbg->param_value_string;
}
//If this two parameters is not find, this is the end of this function
if ($_SESSION['maarch_entreprise']['xml_versionbase'] <> 'none' ) {
diff --git a/apps/maarch_entreprise/xml/database_version.xml b/apps/maarch_entreprise/xml/database_version.xml
index b0568818874..e4f1e794e92 100755
--- a/apps/maarch_entreprise/xml/database_version.xml
+++ b/apps/maarch_entreprise/xml/database_version.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
- <database_version>1706</database_version> <!-- 17.06 -->
+ <database_version>18.04.1</database_version> <!-- 18.04 -->
</root>
diff --git a/sql/data_fr.sql b/sql/data_fr.sql
index 5305f324b0a..c475e2cb151 100755
--- a/sql/data_fr.sql
+++ b/sql/data_fr.sql
@@ -1139,7 +1139,7 @@ INSERT INTO parameters (id, param_value_string, param_value_int, param_value_dat
INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('folder_id_increment', '', 200, NULL);
INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('work_batch_autoimport_id', NULL, 1, NULL);
INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('postindexing_workbatch', NULL, 1, NULL);
-INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('database_version', '17.06.2', 1706, NULL);
+INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('database_version', '18.04.1', NULL, NULL);
INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('user_quota', '', 0, NULL);
------------
--DIFFLIST_TYPES
diff --git a/sql/develop.sql b/sql/develop.sql
index 2a83ecb15d3..ff7d476073a 100755
--- a/sql/develop.sql
+++ b/sql/develop.sql
@@ -751,3 +751,5 @@ UPDATE notifications SET event_id = 'baskets' WHERE notification_id = 'BASKETS';
DELETE FROM parameters where id = 'user_quota';
INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('user_quota', '', 0, NULL);
+DELETE FROM parameters where id = 'database_version';
+INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('database_version', '18.04.1', NULL, NULL);
--
GitLab