gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-10-10 02:52:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix merge errors

Browse Source
This commit is contained in:
Uwe Steinmann 2018-11-16 20:18:27 +01:00
parent 046d07bbf1
commit 0f39ccc7c3
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
views/bootstrap/class.Tasks.php
View File

@ -57,13 +57,9 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
} }
} }
} }
<<<<<<< HEAD
if($workflowmode == 'traditional') if($workflowmode == 'traditional')
if(!$tasksinmenu || in_array('review', $tasksinmenu)) { if(!$tasksinmenu || in_array('review', $tasksinmenu)) {
$tasks['review'] = array(); $tasks['review'] = array();
=======
if($workflowmode == 'traditional') {
>>>>>>> seeddms-5.1.x
$resArr = $dms->getDocumentList('ReviewByMe', $user); $resArr = $dms->getDocumentList('ReviewByMe', $user);
if($resArr) { if($resArr) {
foreach ($resArr as $res) { foreach ($resArr as $res) {
@ -71,7 +67,6 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) { if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
$tasks['review'][] = array('id'=>$res['id'], 'name'=>$res['name']); $tasks['review'][] = array('id'=>$res['id'], 'name'=>$res['name']);
} }
<<<<<<< HEAD
} }
} }
} }
@ -98,8 +93,6 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) { if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
$tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']); $tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']);
} }
=======
>>>>>>> seeddms-5.1.x
} }
} }
} }