gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-29 04:57:20 +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 2020-05-18 18:31:46 +02:00
commit e4ac7a9275
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -156,6 +156,7 @@
- clipboard can be pinned to fixed position - clipboard can be pinned to fixed position
- use standard output for document rows on MyDocuments page - use standard output for document rows on MyDocuments page
- new seeddms logo - new seeddms logo
- fix moving clipboard (Closes: #473)
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.16 Changes in version 5.1.16

4
inc/inc.ClassSession.php
View File

@ -294,7 +294,7 @@ class SeedDMS_Session {
function addToClipboard($object) { /* {{{ */ function addToClipboard($object) { /* {{{ */
/* id is only set if load() was called before */ /* id is only set if load() was called before */
if($this->id) { if($this->id) {
$dms = $object->_dms; $dms = $object->getDMS();
if($object->isType('document')) { if($object->isType('document')) {
if(!in_array($object->getID(), $this->data['clipboard']['docs'])) if(!in_array($object->getID(), $this->data['clipboard']['docs']))
array_push($this->data['clipboard']['docs'], $object->getID()); array_push($this->data['clipboard']['docs'], $object->getID());
@ -317,7 +317,7 @@ class SeedDMS_Session {
function removeFromClipboard($object) { /* {{{ */ function removeFromClipboard($object) { /* {{{ */
/* id is only set if load() was called before */ /* id is only set if load() was called before */
if($this->id) { if($this->id) {
$dms = $object->_dms; $dms = $object->getDMS();
if($object->isType('document')) { if($object->isType('document')) {
$key = array_search($object->getID(), $this->data['clipboard']['docs']); $key = array_search($object->getID(), $this->data['clipboard']['docs']);
if($key !== false) if($key !== false)

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

@ -464,7 +464,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
} }
if($this->params['enableclipboard']) { if($this->params['enableclipboard']) {
echo " <div id=\"menu-clipboard\">"; echo " <div id=\"menu-clipboard\">";
echo " <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Clipboard\" data-action=\"menuClipboard\" data-query=\"folderid=1\"></div>"; echo " <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Clipboard\" data-action=\"menuClipboard\" data-query=\"folderid=".($folder != null ? $folder->getID() : 0)."\"></div>";
echo " </div>"; echo " </div>";
} }

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

@ -65,7 +65,7 @@ class SeedDMS_View_Clipboard extends SeedDMS_Bootstrap_Style {
} }
$content .= " <li class=\"divider\"></li>\n"; $content .= " <li class=\"divider\"></li>\n";
if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) { if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) {
$content .= " <li><a href=\"../op/op.MoveClipboard.php?targetid=".$this->params['folder']->getID()."&refferer=".urlencode($this->params['refferer'])."\">".getMLText("move_clipboard")."</a></li>\n"; $content .= " <li><a href=\"../op/op.MoveClipboard.php?targetid=".$this->params['folder']->getID()."&refferer=".urlencode('../out/out.ViewFolder.php?folderid='.$this->params['folder']->getID())."\">".getMLText("move_clipboard")."</a></li>\n";
} }
// $content .= " <li><a href=\"../op/op.ClearClipboard.php?refferer=".urlencode($this->params['refferer'])."\">".getMLText("clear_clipboard")."</a><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">kkk</a> </li>\n"; // $content .= " <li><a href=\"../op/op.ClearClipboard.php?refferer=".urlencode($this->params['refferer'])."\">".getMLText("clear_clipboard")."</a><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">kkk</a> </li>\n";
// $content .= " <li><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">".getMLText("clear_clipboard")."</a></li>\n"; // $content .= " <li><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">".getMLText("clear_clipboard")."</a></li>\n";