mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-31 22:17:33 +00:00
fix merge errors
This commit is contained in:
parent
046d07bbf1
commit
0f39ccc7c3
|
@ -57,13 +57,9 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
|
|||
}
|
||||
}
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
if($workflowmode == 'traditional')
|
||||
if(!$tasksinmenu || in_array('review', $tasksinmenu)) {
|
||||
$tasks['review'] = array();
|
||||
=======
|
||||
if($workflowmode == 'traditional') {
|
||||
>>>>>>> seeddms-5.1.x
|
||||
$resArr = $dms->getDocumentList('ReviewByMe', $user);
|
||||
if($resArr) {
|
||||
foreach ($resArr as $res) {
|
||||
|
@ -71,7 +67,6 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
|
|||
if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
|
||||
$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()) {
|
||||
$tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']);
|
||||
}
|
||||
=======
|
||||
>>>>>>> seeddms-5.1.x
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user