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 2017-12-19 11:33:00 +01:00
commit 70ea4c2314
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SeedDMS_Core/Core/inc.ClassDocumentCategory.php
View File

@ -98,7 +98,8 @@ class SeedDMS_Core_DocumentCategory {
$documents = array(); $documents = array();
foreach ($resArr as $row) { foreach ($resArr as $row) {
array_push($documents, $this->_dms->getDocument($row["documentID"])); if($doc = $this->_dms->getDocument($row["documentID"]))
array_push($documents, $doc);
} }
return $documents; return $documents;
} /* }}} */ } /* }}} */

6
views/bootstrap/class.Categories.php
View File

@ -46,6 +46,8 @@ $(document).ready( function() {
}); });
}); });
<?php <?php
$this->printDeleteFolderButtonJs();
$this->printDeleteDocumentButtonJs();
} /* }}} */ } /* }}} */
function info() { /* {{{ */ function info() { /* {{{ */
@ -63,6 +65,7 @@ $(document).ready( function() {
echo "</table>"; echo "</table>";
$documents = $selcat->getDocumentsByCategory(10); $documents = $selcat->getDocumentsByCategory(10);
if($documents) {
print "<table id=\"viewfolder-table\" class=\"table\">"; print "<table id=\"viewfolder-table\" class=\"table\">";
print "<thead>\n<tr>\n"; print "<thead>\n<tr>\n";
print "<th></th>\n"; print "<th></th>\n";
@ -76,6 +79,7 @@ $(document).ready( function() {
} }
print "</tbody></table>"; print "</tbody></table>";
} }
}
} /* }}} */ } /* }}} */
function actionmenu() { /* {{{ */ function actionmenu() { /* {{{ */
@ -134,6 +138,8 @@ $(document).ready( function() {
$categories = $this->params['categories']; $categories = $this->params['categories'];
$selcat = $this->params['selcategory']; $selcat = $this->params['selcategory'];
$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
$this->htmlStartPage(getMLText("admin_tools")); $this->htmlStartPage(getMLText("admin_tools"));
$this->globalNavigation(); $this->globalNavigation();
$this->contentStart(); $this->contentStart();

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

@ -102,18 +102,18 @@ function loadMoreObjects(element, limit) {
var folder = element.data('folder') var folder = element.data('folder')
var offset = element.data('offset') var offset = element.data('offset')
// var limit = element.data('limit') // var limit = element.data('limit')
url = seeddms_webroot+"out/out.ViewFolder.php?action=entries&folderid="+folder+"&offset="+offset+"&limit="+limit; url = seeddms_webroot+"out/out.ViewFolder.php?action=entries&folderid="+folder+"&offset="+offset+"&limit="+limit<?= $orderby ? '+"&orderby='.$orderby.'"' : "" ?>;
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: url, url: url,
dataType: 'json', dataType: 'json',
success: function(data){ success: function(data){
$('#viewfolder-table').append(data.html); $('#viewfolder-table').append(data.html);
console.log(data.count);
if(data.count <= 0) { if(data.count <= 0) {
element.hide(); element.hide();
} else { } else {
element.text(data.count+" more objects"); var str = '<?= getMLText('x_more_objects') ?>';
element.text(str.replace('[number]', data.count));
element.data('offset', offset+limit); element.data('offset', offset+limit);
} }
} }
@ -188,7 +188,6 @@ $('#loadmore').click(function(e) {
$txt = $this->callHook('folderListSeparator', $folder); $txt = $this->callHook('folderListSeparator', $folder);
if(is_string($txt)) if(is_string($txt))
$content .= $txt; $content .= $txt;
else $content .= "<tr><td colspan=\"4\">kkkkk</td></tr>";
} }
} }
@ -454,7 +453,7 @@ $('#loadmore').click(function(e) {
echo "</tbody>\n</table>\n"; echo "</tbody>\n</table>\n";
if($maxItemsPerPage && $i > $maxItemsPerPage) if($maxItemsPerPage && $i > $maxItemsPerPage)
echo "<button id=\"loadmore\" style=\"width: 100%; margin-bottom: 20px;\" class=\"btn btn-default\" data-folder=\"".$folder->getId()."\"data-offset=\"".$maxItemsPerPage."\" data-limit=\"".$incItemsPerPage."\" data-all=\"".($i-$maxItemsPerPage)."\">".getMLText('x_more_objects', array('number', ($i-$maxItemsPerPage)))."</button>"; echo "<button id=\"loadmore\" style=\"width: 100%; margin-bottom: 20px;\" class=\"btn btn-default\" data-folder=\"".$folder->getId()."\"data-offset=\"".$maxItemsPerPage."\" data-limit=\"".$incItemsPerPage."\" data-all=\"".($i-$maxItemsPerPage)."\">".getMLText('x_more_objects', array('number'=>($i-$maxItemsPerPage)))."</button>";
} }
else printMLText("empty_folder_list"); else printMLText("empty_folder_list");