From 59d56ea49861eaebb2afef1c1a87649eb5e51bbe Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 23 Mar 2018 17:45:32 +0100 Subject: [PATCH 1/3] add target to create repository --- Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 696af4d6c..dad42bf62 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,16 @@ webapp: (cd tmp; tar --exclude=.svn -czvf ../seeddms-webapp-$(VERSION).tar.gz seeddms-webapp-$(VERSION)) rm -rf tmp +repository: + mkdir -p tmp/seeddms-repository-$(VERSION) + cp -a repository/www repository/utils repository/doc tmp/seeddms-repository-$(VERSION) + mkdir -p tmp/seeddms-repository-$(VERSION)/files + mkdir -p tmp/seeddms-repository-$(VERSION)/accounts + cp -a repository/files/.htaccess tmp/seeddms-repository-$(VERSION)/files + cp -a repository/accounts/.htaccess tmp/seeddms-repository-$(VERSION)/accounts + (cd tmp; tar --exclude=.svn -czvf ../seeddms-repository-$(VERSION).tar.gz seeddms-repository-$(VERSION)) + rm -rf tmp + dynamic_content.tar.gz: ext/dynamic_content tar czvf dynamic_content.tar.gz ext/dynamic_content @@ -53,4 +63,4 @@ doc: apidoc: apigen generate -s SeedDMS_Core --exclude tests -d html -.PHONY: webdav webapp +.PHONY: webdav webapp repository From 06efeae431e09a8abc9f7ef02c16351fab9dc024 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 23 Mar 2018 17:52:07 +0100 Subject: [PATCH 2/3] do not remove user when transfering objects --- op/op.UsrMgr.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php index ef5bb0270..e955f3a85 100644 --- a/op/op.UsrMgr.php +++ b/op/op.UsrMgr.php @@ -245,9 +245,6 @@ else if ($action == "transferobjects") { } $userToAssign = $dms->getUser($_POST["assignTo"]); - if (!$userToRemove->remove($user, $userToAssign)) { - UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); - } // if(isset($_POST["status"]) && is_array($_POST["status"]) && $_POST["status"]) { if (!$userToRemove->transferDocumentsFolders($userToAssign)) { From 3c411102d0b30a8fe71854d0c0ee7814486a69dd Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 23 Mar 2018 17:52:44 +0100 Subject: [PATCH 3/3] add entry for 5.1.6 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index f547f9098..20b254c8f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,7 @@ - fix sending notification when document attributes change - sending notification when folder attributes change - check if converters are set in out/out.ViewDocument.php at all (Closes #394) +- do not remove user when transfering objects -------------------------------------------------------------------------------- Changes in version 5.1.6