gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-14 05:31: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 2021-03-16 19:15:23 +01:00
commit 18cfdb3efe
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SeedDMS_Core/Core/inc.ClassDocument.php
View File

@ -2777,6 +2777,11 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
} }
// remove all document files // remove all document files
/* make sure to get all attachments because _removeContent() did remove
* the attachments of a version already and the list of attachments
* is still stored in _documentFiles
* */
unset($this->_documentFiles);
$res = $this->getDocumentFiles(); $res = $this->getDocumentFiles();
if (is_bool($res) && !$res) { if (is_bool($res) && !$res) {
$db->rollbackTransaction(); $db->rollbackTransaction();

1
SeedDMS_Core/package.xml
View File

@ -1885,6 +1885,7 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
- add parameter $incdisabled to SeedDMS_Core_Folder::getNotifyList() - add parameter $incdisabled to SeedDMS_Core_Folder::getNotifyList()
- do not validate value in SeedDMS_Core_Attribute::setValue(), it should have been done before - do not validate value in SeedDMS_Core_Attribute::setValue(), it should have been done before
- SeedDMS_Core_DMS::search() can search for last date of document status change - SeedDMS_Core_DMS::search() can search for last date of document status change
- fix SeedDMS_Core_Document::remove when version had its own attachments
</notes> </notes>
</release> </release>
<release> <release>

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

@ -1153,6 +1153,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
((isset($value['value']) && is_string($value['value'])) || !empty($value['value']) ? ' value="'.$value['value'].'"' : ''). ((isset($value['value']) && is_string($value['value'])) || !empty($value['value']) ? ' value="'.$value['value'].'"' : '').
(!empty($value['placeholder']) ? ' placeholder="'.$value['placeholder'].'"' : ''). (!empty($value['placeholder']) ? ' placeholder="'.$value['placeholder'].'"' : '').
(!empty($value['autocomplete']) ? ' autocomplete="'.$value['autocomplete'].'"' : ''). (!empty($value['autocomplete']) ? ' autocomplete="'.$value['autocomplete'].'"' : '').
(isset($value['min']) ? ' min="'.$value['min'].'"' : '').
(!empty($value['checked']) ? ' checked' : ''). (!empty($value['checked']) ? ' checked' : '').
(!empty($value['required']) ? ' required' : ''); (!empty($value['required']) ? ' required' : '');
if(!empty($value['attributes']) && is_array($value['attributes'])) if(!empty($value['attributes']) && is_array($value['attributes']))