Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Adjust code.

Browse Source
This commit is contained in:
tianshujie98
2021-06-28 13:03:16 +08:00
parent a55ddb6bd7
commit 626f7346fa
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+1 -1
View File
@@ -1057,7 +1057,7 @@ class actionModel extends model
continue;
}
if($action->objectType == 'story' and strpos('importtostorylib,approve', $action->action) !== false)
if($action->objectType == 'story' and strpos('importtostorylib,passapprove', $action->action) !== false)
{
$action->objectLink = helper::createLink('assetlib', 'storyView', sprintf($vars, $action->objectID), '', '', $projectID);
}
module/company/view/dynamic.html.php
+10 -1
View File
@@ -61,7 +61,16 @@
<span class="text"><?php echo $action->objectLabel;?></span>
<?php $openApp = '';?>
<?php if($action->objectType == 'meeting') $openApp = $action->project ? "data-app='project'" : "data-app='my'";?>
<?php echo html::a($action->objectLink, $action->objectName, '', $openApp);?>
<?php
if(isset($config->action->assetlibModule) and strpos($config->action->assetlibModule, $action->objectType) !== false and $action->action == 'rejectapproved')
{
echo $action->extra;
}
else
{
echo html::a($action->objectLink, $action->objectName, '', $openApp);
}
?>
<span class="label label-id"><?php echo $action->objectID;?></span>
<?php endif;?>
</span>
module/my/view/dynamic.html.php
+10 -1
View File
@@ -59,7 +59,16 @@
<span class="text-muted"><?php echo $action->objectLabel;?></span>
<?php $openApp = '';?>
<?php if($action->objectType == 'meeting') $openApp = $action->project ? "data-app='project'" : "data-app='my'";?>
<?php echo html::a($action->objectLink, $action->objectName, '', $openApp);?>
<?php
if(isset($config->action->assetlibModule) and strpos($config->action->assetlibModule, $action->objectType) !== false and $action->action == 'rejectapproved')
{
echo $action->extra;
}
else
{
echo html::a($action->objectLink, $action->objectName, '', $openApp);
}
?>
<span class="label label-id"><?php echo $action->objectID;?></span>
<?php endif;?>
</span>