mirror of
https://git.code.sf.net/p/seeddms/code
synced 2024-11-26 23:42:11 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
18cfdb3efe
|
@ -2777,6 +2777,11 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
|
|||
}
|
||||
|
||||
// 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();
|
||||
if (is_bool($res) && !$res) {
|
||||
$db->rollbackTransaction();
|
||||
|
|
|
@ -1885,6 +1885,7 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
|
|||
- add parameter $incdisabled to SeedDMS_Core_Folder::getNotifyList()
|
||||
- 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
|
||||
- fix SeedDMS_Core_Document::remove when version had its own attachments
|
||||
</notes>
|
||||
</release>
|
||||
<release>
|
||||
|
|
|
@ -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'].'"' : '').
|
||||
(!empty($value['placeholder']) ? ' placeholder="'.$value['placeholder'].'"' : '').
|
||||
(!empty($value['autocomplete']) ? ' autocomplete="'.$value['autocomplete'].'"' : '').
|
||||
(isset($value['min']) ? ' min="'.$value['min'].'"' : '').
|
||||
(!empty($value['checked']) ? ' checked' : '').
|
||||
(!empty($value['required']) ? ' required' : '');
|
||||
if(!empty($value['attributes']) && is_array($value['attributes']))
|
||||
|
|
Loading…
Reference in New Issue
Block a user