gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 07:04:57 +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 2022-11-22 06:56:46 +01:00
commit 9e4eae8206
6 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CHANGELOG
View File

@ -1,3 +1,8 @@
--------------------------------------------------------------------------------
Changes in version 6.0.22
--------------------------------------------------------------------------------
- merge changes up to 5.1.28
--------------------------------------------------------------------------------
Changes in version 6.0.21
--------------------------------------------------------------------------------
@ -238,6 +243,13 @@
- add document list which can be exported as an archive
- search results can be exported
--------------------------------------------------------------------------------
Changes in version 5.1.29
--------------------------------------------------------------------------------
- fix php errors in restapi
- fix 'maximum size' error when uploading a file with drag&drop
>>>>>>> seeddms-5.1.x
--------------------------------------------------------------------------------
Changes in version 5.1.28
--------------------------------------------------------------------------------

6
SeedDMS_Core/Core/inc.ClassFolder.php
View File

@ -1062,7 +1062,11 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
}
if($categories) {
$document->setCategories($categories);
if(!$document->setCategories($categories)) {
$document->remove();
$db->rollbackTransaction();
return false;
}
}
if($attributes) {

22
SeedDMS_Core/package.xml
View File

@ -12,11 +12,11 @@
<email>uwe@steinmann.cx</email>
<active>yes</active>
</lead>
<date>2022-11-18</date>
<date>2022-11-21</date>
<time>13:44:55</time>
<version>
<release>6.0.21</release>
<api>6.0.21</api>
<api>6.0.22</api>
</version>
<stability>
<release>stable</release>
@ -24,7 +24,7 @@
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
- all changes from 5.1.28 merged
- all changes from 5.1.29 merged
</notes>
<contents>
<dir baseinstalldir="SeedDMS" name="/">
@ -2440,5 +2440,21 @@ better error checking in SeedDMS_Core_Document::cancelCheckOut()
- SeedDMЅ_Core_DMS::getDocumentsInRevision() returns status from revision log
</notes>
</release>
<release>
<date>2022-11-18</date>
<time>13:44:55</time>
<version>
<release>6.0.21</release>
<api>6.0.21</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
- all changes from 5.1.28 merged
</notes>
</release>
</changelog>
</package>

2
inc/inc.Version.php
View File

@ -20,7 +20,7 @@
class SeedDMS_Version { /* {{{ */
const _number = "6.0.21";
const _number = "6.0.22";
const _string = "SeedDMS";
function __construct() {

8
restapi/index.php
View File

@ -2268,19 +2268,19 @@ class RestapiController { /* {{{ */
} /* }}} */
function addUserAccessToFolder($request, $response, $args) { /* {{{ */
return changeFolderAccess($request, $response, $args, 'add', 'user');
return $this->changeFolderAccess($request, $response, $args, 'add', 'user');
} /* }}} */
function addGroupAccessToFolder($request, $response, $args) { /* {{{ */
return changeFolderAccess($request, $response, $args, 'add', 'group');
return $this->changeFolderAccess($request, $response, $args, 'add', 'group');
} /* }}} */
function removeUserAccessFromFolder($request, $response, $args) { /* {{{ */
return changeFolderAccess($request, $response, $args, 'remove', 'user');
return $this->changeFolderAccess($request, $response, $args, 'remove', 'user');
} /* }}} */
function removeGroupAccessFromFolder($request, $response, $args) { /* {{{ */
return changeFolderAccess($request, $response, $args, 'remove', 'group');
return $this->changeFolderAccess($request, $response, $args, 'remove', 'group');
} /* }}} */
function changeFolderAccess($request, $response, $args, $operationType, $userOrGroup) { /* {{{ */

2
views/bootstrap/class.ViewFolder.php
View File

@ -235,7 +235,7 @@ $('body').on('click', '.order-btn', function(ev) {
if($showtree == 1)
$this->printNewTreeNavigationJs($folder->getID(), M_READ, 0, 'maintree', ($expandFolderTree == 1) ? -1 : 3, $orderby);
if ($enableDropUpload && $folder->getAccessMode($user) >= M_READWRITE) {
if ($enableDropUpload /*&& $folder->getAccessMode($user) >= M_READWRITE*/) {
echo "SeedDMSUpload.setUrl('".$this->params['settings']->_httpRoot."op/op.Ajax.php');";
echo "SeedDMSUpload.setAbortBtnLabel('".getMLText("cancel")."');";
echo "SeedDMSUpload.setEditBtnLabel('".getMLText("edit_document_props")."');";