gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2018-03-23 19:30:59 +01:00
commit 8d7e6715fa
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -106,6 +106,7 @@
- fix sending notification when document attributes change - fix sending notification when document attributes change
- sending notification when folder attributes change - sending notification when folder attributes change
- check if converters are set in out/out.ViewDocument.php at all (Closes #394) - 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 Changes in version 5.1.6

12
Makefile
View File

@ -37,6 +37,16 @@ webapp:
(cd tmp; tar --exclude=.svn -czvf ../seeddms-webapp-$(VERSION).tar.gz seeddms-webapp-$(VERSION)) (cd tmp; tar --exclude=.svn -czvf ../seeddms-webapp-$(VERSION).tar.gz seeddms-webapp-$(VERSION))
rm -rf tmp 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 dynamic_content.tar.gz: ext/dynamic_content
tar czvf dynamic_content.tar.gz ext/dynamic_content tar czvf dynamic_content.tar.gz ext/dynamic_content
@ -57,4 +67,4 @@ doc:
apidoc: apidoc:
apigen generate -s SeedDMS_Core --exclude tests -d html apigen generate -s SeedDMS_Core --exclude tests -d html
.PHONY: webdav webapp .PHONY: webdav webapp repository

3
op/op.UsrMgr.php
View File

@ -257,9 +257,6 @@ else if ($action == "transferobjects") {
} }
$userToAssign = $dms->getUser($_POST["assignTo"]); $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(isset($_POST["status"]) && is_array($_POST["status"]) && $_POST["status"]) {
if (!$userToRemove->transferDocumentsFolders($userToAssign)) { if (!$userToRemove->transferDocumentsFolders($userToAssign)) {