From 382b9a4568bbe96afc35fab51d1b87ea2654add6 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 8 Apr 2013 07:50:46 +0200 Subject: [PATCH 1/4] set propper folderList of subfolders after setting a new parent --- SeedDMS_Core/Core/inc.ClassFolder.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php index deb7404de..5420e9458 100644 --- a/SeedDMS_Core/Core/inc.ClassFolder.php +++ b/SeedDMS_Core/Core/inc.ClassFolder.php @@ -178,6 +178,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { $res = $db->getResult($queryStr); if (!$res) return false; + $this->_parentID = $newParent->getID(); $this->_parent = $newParent; @@ -192,6 +193,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { $pathPrefix .= ":"; } + /* Update path in folderList for all documents */ $queryStr = "SELECT `tblDocuments`.`id`, `tblDocuments`.`folderList` FROM `tblDocuments` WHERE `folderList` LIKE '%:".$this->_id.":%'"; $resArr = $db->getResultArray($queryStr); if (is_bool($resArr) && $resArr == false) @@ -203,6 +205,18 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { $res = $db->getResult($queryStr); } + /* Update path in folderList for all documents */ + $queryStr = "SELECT `tblFolders`.`id`, `tblFolders`.`folderList` FROM `tblFolders` WHERE `folderList` LIKE '%:".$this->_id.":%'"; + $resArr = $db->getResultArray($queryStr); + if (is_bool($resArr) && $resArr == false) + return false; + + foreach ($resArr as $row) { + $newPath = preg_replace("/^.*:".$this->_id.":(.*$)/", $pathPrefix."\\1", $row["folderList"]); + $queryStr="UPDATE `tblFolders` SET `folderList` = '".$newPath."' WHERE `tblFolders`.`id` = '".$row["id"]."'"; + $res = $db->getResult($queryStr); + } + return true; } /* }}} */ From 0d89fe7aa6d2424587a546cacebc41a1a750dc1e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 8 Apr 2013 07:51:53 +0200 Subject: [PATCH 2/4] do not output folder name twice --- views/bootstrap/class.ObjectCheck.php | 1 - 1 file changed, 1 deletion(-) diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php index 077376bcf..d3d995408 100644 --- a/views/bootstrap/class.ObjectCheck.php +++ b/views/bootstrap/class.ObjectCheck.php @@ -46,7 +46,6 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style { for ($i = 1; $i < count($tmppath); $i++) { print "/".htmlspecialchars($tmppath[$i]->getName()); } - print $folder->getName(); print ""; $owner = $folder->getOwner(); From 72200c5f96e9cd36519247b0b052e0b7bdc43590 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 8 Apr 2013 07:58:28 +0200 Subject: [PATCH 3/4] prepare for new version 4.1.2 --- CHANGELOG | 6 ++++++ Makefile | 2 +- SeedDMS_Core/Core/inc.ClassDMS.php | 2 +- SeedDMS_Core/package.xml | 26 +++++++++++++++++++++----- inc/inc.Version.php | 2 +- install/install.php | 2 +- 6 files changed, 31 insertions(+), 9 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b921def6b..43c66a3c6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +-------------------------------------------------------------------------------- + Changes in version 4.1.2 +-------------------------------------------------------------------------------- +- set propper internal folder path of sub folders after moving a folder + to a new place + -------------------------------------------------------------------------------- Changes in version 4.1.1 -------------------------------------------------------------------------------- diff --git a/Makefile b/Makefile index 14c3691a2..8de0257d2 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=4.1.1 +VERSION=4.1.2 SRC=CHANGELOG inc conf utils index.php languages views op out README.md README.Notification README.Ubuntu drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install #restapi webapp diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index 7f9f82d0d..041d329bd 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -225,7 +225,7 @@ class SeedDMS_Core_DMS { $this->convertFileTypes = array(); $this->version = '@package_version@'; if($this->version[0] == '@') - $this->version = '4.1.1'; + $this->version = '4.1.2'; } /* }}} */ function getDB() { /* {{{ */ diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 04a66b506..67de1d9a7 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -15,16 +15,16 @@ 2013-04-05 - 4.1.1 - 4.1.1 + 4.1.2 + 4.1.0 - beta + stable stable GPL License -- stay in sync with seeddms application +- set propper folderList of sub folders after moving a folder @@ -449,5 +449,21 @@ New release - minor bugfixes - + + 2013-04-05 + + + 4.1.1 + 4.1.1 + + + beta + stable + + GPL License + +- stay in sync with seeddms application + + + diff --git a/inc/inc.Version.php b/inc/inc.Version.php index 2bfa83417..fbf4927d0 100644 --- a/inc/inc.Version.php +++ b/inc/inc.Version.php @@ -20,7 +20,7 @@ class SeedDMS_Version { - var $_number = "4.1.1"; + var $_number = "4.1.2"; var $_string = "SeedDMS"; function SeedDMS_Version() { diff --git a/install/install.php b/install/install.php index 51f700ef0..d7d3ecf4a 100644 --- a/install/install.php +++ b/install/install.php @@ -116,7 +116,7 @@ function fileExistsInIncludePath($file) { /* {{{ */ * Load default settings + set */ define("SEEDDMS_INSTALL", "on"); -define("SEEDDMS_VERSION", "4.1.1"); +define("SEEDDMS_VERSION", "4.1.2"); require_once('../inc/inc.ClassSettings.php'); From f9c60b282421d4d9ce8de4c8b702d05e28cf1d23 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 8 Apr 2013 08:01:50 +0200 Subject: [PATCH 4/4] fix xml error --- SeedDMS_Core/package.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 67de1d9a7..5ff2f3bd7 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -464,6 +464,6 @@ New release - stay in sync with seeddms application - +