Update to 2.5.1

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.5.1
+- [T198]                    Ready for PHP 8.1.2
+- [T204]                    Don't show unused fields
+- [T199]                    Easy Demo Login
+- [T189]                    Bugfix
+----------------------------------------------------------------------------------------------------
 # 2.5
 - [T81 | GitHub Issue #4]   Bugfix -> User can't be deleted
 - [T157]                    Yii2 framework update 2.0.12 to 2.0.43

database_model/liquibase/changesets/0000114/changelog.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+	<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd"
+
+	logicalFilePath="000114/changelog.xml">
+
+	<changeSet author="patrick_schmitz" id="000114" context="">
+		<sql stripComments="false" splitStatements="false">
+		<![CDATA[
+        ALTER TABLE data_delivery_object_log ADD COLUMN "fk_object_persistence_method_id";
+		]]>		
+		</sql>		
+
+		<sql stripComments="false" splitStatements="false">
+		<![CDATA[
+        ALTER TABLE data_delivery_object_log ADD COLUMN "fk_object_persistence_method_uuid";
+		]]>		
+		</sql>
+
+		<sql stripComments="false" splitStatements="false">
+		<![CDATA[
+        ALTER TABLE data_delivery_object_log ADD COLUMN "fk_datamanagement_process_id";
+		]]>		
+		</sql>		
+
+		<sql stripComments="false" splitStatements="false">
+		<![CDATA[
+        ALTER TABLE data_delivery_object_log ADD COLUMN "fk_datamanagement_process_uuid";
+		]]>		
+		</sql>
+
+		<comment>
+		<![CDATA[
+		New fields "fk_datamanagement_process_id", "fk_datamanagement_process_uuid", "fk_object_persistence_method_id", "fk_object_persistence_method_uuid" for several tables.
+		Used objects:
+            data_delivery_object_log
+		Phabricator tasks:
+			T189
+        ]]>
+		</comment>
+</changeSet>
+</databaseChangeLog>

database_model/liquibase/db.changelog-master.xml

@@ -136,4 +136,5 @@
   <include relativeToChangelogFile="true" file="changesets/0000111/changelog.xml"/>  <!-- SQL ALTER TABLE | user -->
   <include relativeToChangelogFile="true" file="changesets/0000112/changelog.xml"/>  <!-- SQL ALTER TABLE | user -->
   <include relativeToChangelogFile="true" file="changesets/0000113/changelog.xml"/>  <!-- CREATE trigger | TRIG_user_DELETE -->
+  <include relativeToChangelogFile="true" file="changesets/0000114/changelog.xml"/>  <!-- SQL ALTER TABLE | data_delivery_object_log -->
 </databaseChangeLog> 

helper_tools/Python/installer/base_lib.py

@@ -3,7 +3,7 @@
 # Instllation or update meta#grid
 # on every OS
 # Base helper library
-# v1.4
+# v1.6
 
 import os
 import subprocess
@@ -27,7 +27,7 @@
 from xml.dom import minidom
 
 def myVersion():
-    return "1.4"
+    return "1.6"
 
 def bla(msg, action=None, withLooging=True, logfilepath="", logfile=""):
     colorama.init()
@@ -497,4 +497,4 @@ def yii_check_requirements(phpExe, frontendfilesforlder):
     p = subprocess.Popen([phpExe, os.path.join(frontendfilesforlder, "requirements.php")], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     out=p.communicate()[0]
     out1 = out.splitlines()
-    return out1
+    return out1

helper_tools/Python/installer/meta-grid_install_or_update.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 # Instllation or update meta#grid
 # on every OS
-# v1.4
+# v1.6
 
 import base_lib
 import shutil
@@ -23,7 +23,7 @@
 git_repo_url = "https://github.com/patschwork/meta_grid.git"
 git_repo_zip_url = "https://github.com/patschwork/meta_grid/archive/master.zip"
 min_php_version = "7.0"
-max_php_version = "7.4" # Upper version limit for PHP (depends on the used Yii2 framework)
+max_php_version = "8.1.2" # Upper version limit for PHP (depends on the used Yii2 framework)
 used_rdbms = const_sqlite
 folderfile_Database = "../../../dwh_meta.sqlite"
 folder_Frontend = "../../../frontend/yii/basic"
@@ -323,7 +323,7 @@ def bla(msg, action=None, withLooging=True, wait=False):
 
 # Yii2 Check requirements (we have to use the folder downloaded from the repository... We want to check the to be installed version)
 # Note: Still in Yii2 2.0.33 Requirement for PHP is minimum 5.4.0. That's not true in fact... :-(
-res = base_lib.yii_check_requirements(phpExe, abspath_frontend)
+res = base_lib.yii_check_requirements(phpExe, folder_Fresh_frontend)
 for i in range(len(res)-4,len(res)-1):
     if (res[i].find("Errors:") >= 0):
         yii2reqsummaryline = res[i]
@@ -541,4 +541,4 @@ def bla(msg, action=None, withLooging=True, wait=False):
 
 bla("# End of process #", "endOfScript", True)
 if (base_lib.is_windows()):
-    dummy = raw_input()
+    dummy = raw_input()

helper_tools/Python/liquibase/deploy.py

@@ -5,7 +5,10 @@
 # on OS=linux
 import os
 import sys
-import ConfigParser
+if (int(sys.version_info[0]) >= 3):
+    import configparser as ConfigParser
+else:
+    import ConfigParser
 import subprocess
 import datetime
 
@@ -16,17 +19,17 @@
 def cli_params():
     global ENVKEY
     global CONFIGFOLDER
-    print sys.argv
+    print(sys.argv)
     if len(sys.argv) < 2:
-        print "You must call me like:"
-        print "   deploy.py <Environment Key (e.g. DEV)>"
+        print("You must call me like:")
+        print("   deploy.py <Environment Key (e.g. DEV)>")
         raise Exception("Call parameter missing!")
         sys.exit(1)
     ENVKEY = sys.argv[1]
     try:
         CONFIGFOLDER = sys.argv[2]
     except:
-        print "CONFIGFOLDER not given. Using default"
+        print("CONFIGFOLDER not given. Using default")
 
 def ConfigSectionMap(section):
     dict1 = {}
@@ -51,12 +54,17 @@ def writeOutputLog(logpath, msg):
 	myFile.close() 
 
 def printCurrentEnvSettings(prop, value):
-    print prop + ": "  + value
+    print(prop + ": "  + value)
     writeOutputLog(logfilepath, prop + ": "  + value + "\n")
 
 def getFilePathRelativeScriptPath(filepath):
     return os.path.abspath(os.path.join(dirPath, filepath))
 
+
+# if (int(sys.version_info[0]) < 3):
+#     print("You need Python 3 to run this script!")
+#     sys.exit(1)
+
 debug=0
 cli_params()
 
@@ -65,7 +73,7 @@ def getFilePathRelativeScriptPath(filepath):
 
 
 if (os.path.isfile(getConfigFilePath(CONFIGFOLDER, ENVKEY))):
-    print "Config file found: " + getConfigFilePath(CONFIGFOLDER, ENVKEY)
+    print("Config file found: " + getConfigFilePath(CONFIGFOLDER, ENVKEY))
 else:
     raise Exception("Config file not found!")
     sys.exit(1)
@@ -78,8 +86,10 @@ def getFilePathRelativeScriptPath(filepath):
 dirPath = os.path.dirname(realPath)  # /home/user/test
 dirName = os.path.basename(dirPath) # test
 
-
-Config = ConfigParser.SafeConfigParser()
+if (int(sys.version_info[0]) >= 3):
+    Config = ConfigParser.ConfigParser()
+else:
+    Config = ConfigParser.SafeConfigParser()
 # Config._interpolation = ConfigParser.ExtendedInterpolation()
 Config.read(getConfigFilePath(CONFIGFOLDER, ENVKEY))
 
@@ -140,7 +150,7 @@ def getFilePathRelativeScriptPath(filepath):
             output = e.output
         success = False
     writeOutputLog(logfilepath, output)
-    print output
+    print(output)
 else:
     #subprocess.call([liquibasePathExe, "--driver=" + liquibaseDriver, "--changeLogFile=" + getFilePathRelativeScriptPath(liquibaseChangeLogFile), "--url=" + liquibaseDriverUrlprefix , liquibaseAction])        
     try:
@@ -156,4 +166,4 @@ def getFilePathRelativeScriptPath(filepath):
             output = e.output
         success = False
     writeOutputLog(logfilepath, output)
-    print output
+    print(output)

meta_grid/VERSION_meta_grid.txt

@@ -1 +1 @@
-v2.5
+v2.5.1

meta_grid/controllers/AttributeController.php

@@ -207,7 +207,7 @@ public function actionIndex()
 
     /**
      * Displays a single Attribute model.
-     * @param integer $id
+     * @param int $id ID
      * @return mixed
      */
     public function actionView($id)
@@ -250,7 +250,7 @@ public function actionCreate()
     /**
      * Updates an existing Attribute model.
      * If update is successful, the browser will be redirected to the 'view' page.
-     * @param integer $id
+     * @param int $id ID
      * @return mixed
      */
     public function actionUpdate($id)
@@ -278,7 +278,7 @@ public function actionUpdate($id)
     /**
      * Deletes an existing Attribute model.
      * If deletion is successful, the browser will be redirected to the 'index' page.
-     * @param integer $id
+     * @param int $id ID
      * @return mixed
      */
     public function actionDelete($id)
@@ -307,7 +307,7 @@ public function actionDelete($id)
     /**
      * Finds the Attribute model based on its primary key value.
      * If the model is not found, a 404 HTTP exception will be thrown.
-     * @param integer $id
+     * @param int $id ID
      * @return Attribute the loaded model
      * @throws NotFoundHttpException if the model cannot be found
      */

meta_grid/controllers/BracketController.php

@@ -244,7 +244,7 @@ public function actionIndex()
 
     /**
      * Displays a single Bracket model.
-     * @param integer $id
+     * @param int $id ID
      * @return mixed
      */
     public function actionView($id)
@@ -330,16 +330,14 @@ public function actionCreate()
    				'projectList' => $this->getProjectList(),		// autogeneriert ueber gii/CRUD
    				'attributeList' => $this->getAttributeList(),		// autogeneriert ueber gii/CRUD
   				'object_type_as_searchFilterList' => $this->getObjectTypeAsSearchFilterList(),		// autogeneriert ueber gii/CRUD
-  				'object_persistence_methodList' => $this->getObjectPersistenceMethodList(),	  // added **manual**
-  				'datamanagement_processList' => $this->getDatamanagementProcessList(),		  // added **manual**
   				'modelsBracketSearchPattern' => (empty($modelsBracketSearchPattern)) ? [new BracketSearchPattern] : $modelsBracketSearchPattern
       		]);
 		    }
 
     /**
      * Updates an existing Bracket model.
      * If update is successful, the browser will be redirected to the 'view' page.
-     * @param integer $id
+     * @param int $id ID
      * @return mixed
      */
     public function actionUpdate($id)
@@ -404,16 +402,14 @@ public function actionUpdate($id)
    				'projectList' => $this->getProjectList(),		// autogeneriert ueber gii/CRUD
    				'attributeList' => $this->getAttributeList(),		// autogeneriert ueber gii/CRUD
   				'object_type_as_searchFilterList' => $this->getObjectTypeAsSearchFilterList(),		// autogeneriert ueber gii/CRUD
-  				'object_persistence_methodList' => $this->getObjectPersistenceMethodList(),	  // added **manual**
-  				'datamanagement_processList' => $this->getDatamanagementProcessList(),		  // added **manual**
   				'modelsBracketSearchPattern' => (empty($modelsBracketSearchPattern)) ? [new BracketSearchPattern] : $modelsBracketSearchPattern
         ]);
 		    }
 
     /**
      * Deletes an existing Bracket model.
      * If deletion is successful, the browser will be redirected to the 'index' page.
-     * @param integer $id
+     * @param int $id ID
      * @return mixed
      */
     public function actionDelete($id)
@@ -442,7 +438,7 @@ public function actionDelete($id)
     /**
      * Finds the Bracket model based on its primary key value.
      * If the model is not found, a 404 HTTP exception will be thrown.
-     * @param integer $id
+     * @param int $id ID
      * @return Bracket the loaded model
      * @throws NotFoundHttpException if the model cannot be found
      */