gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-12 04:31:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.9' into develop

Browse Source 
Conflicts:
	SeedDMS_Core/Core/inc.ClassDMS.php
	views/bootstrap/class.Search.php
This commit is contained in:
Uwe Steinmann 2014-07-23 20:26:37 +02:00
commit 6443b9aa8e
3 changed files with 873 additions and 870 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1736
CHANGELOG
View File

File diff suppressed because it is too large Load Diff

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

@ -952,6 +952,9 @@ class SeedDMS_Core_DMS {
} else {
$docresult = array('totalDocs'=>0, 'docs'=>array());
}
} else {
$docresult = array('totalDocs'=>0, 'docs'=>array());
}
if($limit) {
$totalPages = (integer)(($totalDocs+$totalFolders)/$limit);
@ -1506,7 +1509,7 @@ class SeedDMS_Core_DMS {
* @return array array of notifications
*/
function getNotificationsByUser($user, $type=0) { /* {{{ */
$queryStr = "SELECT `tblNotify`.* FROM `tblNotify` ".
$queryStr = "SELECT `tblNotify`.* FROM `tblNotify` ".
"WHERE `tblNotify`.`userID` = ". $user->getID();
if($type) {
$queryStr .= " AND `tblNotify`.`targetType` = ". (int) $type;

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

@ -261,6 +261,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
<td><?php $this->printAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : '') ?></td>
</tr>
<?php
}
}
@ -271,7 +272,6 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
</div>
</div>
</div>
<?php
/* First check if any of the folder filters are set. If it is,
* open the accordion.