Merge branch 'sprint/liyuchun_devops18' into 'master'

* Fix bug #18150.

See merge request easycorp/zentaopms!1256
This commit is contained in:
王怡栋
2022-01-04 08:17:56 +00:00
2 changed files with 15 additions and 1 deletions

View File

@@ -1504,4 +1504,18 @@ class mrModel extends model
}
return isset($errorMessage) ? $errorMessage : $message;
}
/**
* Adjust the action clickable.
*
* @param object $MR
* @param string $action
* @access public
* @return void
*/
public static function isClickable($MR, $action)
{
if($action == 'edit' and !$MR->synced) return false;
return true;
}
}

View File

@@ -85,7 +85,7 @@
<td class='c-actions'>
<?php
common::printLink('mr', 'view', "mr={$MR->id}", '<i class="icon icon-eye"></i>', '', "title='{$lang->mr->view}' class='btn btn-info'");
common::printLink('mr', 'edit', "mr={$MR->id}", '<i class="icon icon-edit"></i>', '', "title='{$lang->mr->edit}' class='btn btn-info'");
common::printIcon('mr', 'edit', "mr={$MR->id}", $MR, 'list');
common::printLink('mr', 'diff', "mr={$MR->id}", '<i class="icon icon-diff"></i>', '', "title='{$lang->mr->viewDiff}' class='btn btn-info'");
common::printLink('mr', 'link', "mr={$MR->id}", '<i class="icon icon-link"></i>', '', "title='{$lang->mr->link}' class='btn btn-info'" . ($MR->linkButton == false ? 'disabled' : ''));
common::printLink('mr', 'delete', "mr={$MR->id}", '<i class="icon icon-trash"></i>', 'hiddenwin', "title='{$lang->mr->delete}' class='btn btn-info'");