gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 17:05:46 +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 2022-08-19 08:40:11 +02:00
commit fe419f4857
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,15 +130,15 @@ $(document).ready(function() {
$entries = $this->params['searchhits']; $entries = $this->params['searchhits'];
$newowner = $this->params['newowner']; $newowner = $this->params['newowner'];
if ($user->isAdmin()) { if($newowner && $user->isAdmin()) {
$j = 0; $j = $i = 0;
foreach($entries as $entry) { foreach($entries as $entry) {
if($entry->isType('document')) { // if($entry->isType('document')) {
if($entry->getOwner()->getId() != $newowner->getId()) { if($entry->getOwner()->getId() != $newowner->getId()) {
$entry->setOwner($newowner); $entry->setOwner($newowner);
$j++; $j++;
} }
} // }
} }
$this->setParam('batchmsg', getMLText('batch_new_owner_msg', ['count'=>$j])); $this->setParam('batchmsg', getMLText('batch_new_owner_msg', ['count'=>$j]));
} else { } else {
@ -609,10 +609,13 @@ function typeahead() { /* {{{ */
print $this->html_link('Search', array_merge($_GET, array('action'=>'export')), array('class'=>'btn btn-primary', 'id'=>'export'), "<i class=\"fa fa-download\"></i> ".getMLText("export"), false, true)."\n"; print $this->html_link('Search', array_merge($_GET, array('action'=>'export')), array('class'=>'btn btn-primary', 'id'=>'export'), "<i class=\"fa fa-download\"></i> ".getMLText("export"), false, true)."\n";
$content = ob_get_clean(); $content = ob_get_clean();
$this->printAccordion(getMLText('export'), $content); $this->printAccordion(getMLText('export'), $content);
}
if($total) {
ob_start(); ob_start();
$users = $dms->getAllUsers(); $users = $dms->getAllUsers();
$options = array(); $options = array();
$options[] = array("-1", getMLText("choose_user"));
foreach ($users as $currUser) { foreach ($users as $currUser) {
$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin().' - '.$currUser->getFullName()), false, array(array('data-subtitle', htmlspecialchars($currUser->getEmail())))); $options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin().' - '.$currUser->getFullName()), false, array(array('data-subtitle', htmlspecialchars($currUser->getEmail()))));
} }
@ -626,9 +629,9 @@ function typeahead() { /* {{{ */
'placeholder'=>getMLText('select_users'), 'placeholder'=>getMLText('select_users'),
) )
); );
print $this->html_link('Search', array_merge($_GET, array('action'=>'changeowner')), array('class'=>'btn btn-primary', 'id'=>'changeowner'), "<i class=\"fa fa-user\"></i> ".getMLText("change_owner"), false, true)."\n"; print $this->html_link('Search', array_merge($_GET, array('action'=>'changeowner')), array('class'=>'btn btn-primary', 'id'=>'changeowner'), "<i class=\"fa fa-user\"></i> ".getMLText("batch_change_owner"), false, true)."\n";
$content = ob_get_clean(); $content = ob_get_clean();
$this->printAccordion(getMLText('change_owner'), $content); $this->printAccordion(getMLText('batch_change_owner'), $content);
} }
?> ?>