gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-11-28 10:30:42 +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 2025-07-24 09:35:23 +02:00
commit d74fddaa85
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CHANGELOG
View File

@ -335,7 +335,17 @@
- action when clicking on a thumbnail can be set (download or view online) - action when clicking on a thumbnail can be set (download or view online)
- major update of polish translation - major update of polish translation
- fix getting access rights in getMandatoryApprovers() and getMandatoryReviewers() - fix getting access rights in getMandatoryApprovers() and getMandatoryReviewers()
- better checking for attribute definition when build a search query - better checking for attribute definition when building a search query
- fix list of related documents when hook documentListItem() is implemented
- move EditAttributes into controller and add various hooks (like EditDocument)
- move sending notification mail when attributes are changed into
Notification Service
- more documentation on configuring LDAP
- collect output controller/view hooks with '+' instead of array_merge()
- add hook 'searchExportOptions'
- show how many users have to review/approve a document and how many did
already (in menu task list and document list)
- break long original file names on viewDocument page
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.40 Changes in version 5.1.40

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

@ -3451,6 +3451,8 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
* @param object $document * @param object $document
* @param object $previewer * @param object $previewer
* @param boolean $skipcont set to true if embrasing tr shall be skipped * @param boolean $skipcont set to true if embrasing tr shall be skipped
* In that case call documentListRowStart() before and documentListRowEnd()
* after this method.
*/ */
function documentListRow($document, $previewer, $skipcont=false, $version=0, $extracontent=array()) { /* {{{ */ function documentListRow($document, $previewer, $skipcont=false, $version=0, $extracontent=array()) { /* {{{ */
$dms = $this->params['dms']; $dms = $this->params['dms'];

4
views/bootstrap/class.ViewDocument.php
View File

@ -1940,7 +1940,6 @@ $(document).ready( function() {
$responsibleUser = $link->getUser(); $responsibleUser = $link->getUser();
$targetDoc = $link->getTarget(); $targetDoc = $link->getTarget();
echo $this->documentListRowStart($targetDoc);
$targetDoc->verifyLastestContentExpriry(); $targetDoc->verifyLastestContentExpriry();
$txt = $this->callHook('documentListItem', $targetDoc, $previewer, false, 'reverselinks'); $txt = $this->callHook('documentListItem', $targetDoc, $previewer, false, 'reverselinks');
if(is_string($txt)) if(is_string($txt))
@ -1948,6 +1947,7 @@ $(document).ready( function() {
else { else {
$extracontent = array(); $extracontent = array();
$extracontent['below_title'] = $this->getListRowPath($targetDoc); $extracontent['below_title'] = $this->getListRowPath($targetDoc);
echo $this->documentListRowStart($targetDoc);
echo $this->documentListRow($targetDoc, $previewer, true, 0, $extracontent); echo $this->documentListRow($targetDoc, $previewer, true, 0, $extracontent);
} }
print "<td><span class=\"actions\">"; print "<td><span class=\"actions\">";
@ -2008,7 +2008,6 @@ $(document).ready( function() {
$responsibleUser = $link->getUser(); $responsibleUser = $link->getUser();
$sourceDoc = $link->getDocument(); $sourceDoc = $link->getDocument();
echo $this->documentListRowStart($sourceDoc);
$sourceDoc->verifyLastestContentExpriry(); $sourceDoc->verifyLastestContentExpriry();
$txt = $this->callHook('documentListItem', $sourceDoc, $previewer, false, 'reverselinks'); $txt = $this->callHook('documentListItem', $sourceDoc, $previewer, false, 'reverselinks');
if(is_string($txt)) if(is_string($txt))
@ -2016,6 +2015,7 @@ $(document).ready( function() {
else { else {
$extracontent = array(); $extracontent = array();
$extracontent['below_title'] = $this->getListRowPath($sourceDoc); $extracontent['below_title'] = $this->getListRowPath($sourceDoc);
echo $this->documentListRowStart($sourceDoc);
echo $this->documentListRow($sourceDoc, $previewer, true, 0, $extracontent); echo $this->documentListRow($sourceDoc, $previewer, true, 0, $extracontent);
} }
print "<td><span class=\"actions\">"; print "<td><span class=\"actions\">";

4
views/bootstrap4/class.Bootstrap4.php
View File

@ -3423,7 +3423,9 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
* *
* @param object $document * @param object $document
* @param object $previewer * @param object $previewer
* @param boolean $skipcont set to true if embrasing tr shall be skipped * @param boolean $skipcont set to true if embrasing tr shall be skipped.
* In that case call documentListRowStart() before and documentListRowEnd()
* after this method.
*/ */
function documentListRow($document, $previewer, $skipcont=false, $version=0, $extracontent=array()) { /* {{{ */ function documentListRow($document, $previewer, $skipcont=false, $version=0, $extracontent=array()) { /* {{{ */
$dms = $this->params['dms']; $dms = $this->params['dms'];