Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'

* Fix Bug #30156

See merge request easycorp/zentaopms!6340
This commit is contained in:
王怡栋
2022-11-24 02:14:55 +00:00
2 changed files with 5 additions and 1 deletions
+1
View File
@@ -152,6 +152,7 @@ $(function()
$('td .checkbox-primary').addClass('hidden');
}
$('[data-toggle="popover"]').popover();
});
/**
+4 -1
View File
@@ -195,7 +195,10 @@
<?php $disabled = !empty($executions) ? "disabled='disabled'" : '';?>
<tr class='<?php echo $class;?> division'>
<th><?php echo $lang->project->division;?></th>
<td colspan='3'><?php echo html::radio('division', $lang->project->divisionList, $project->division, $disabled);?></td>
<td colspan='3'>
<?php echo html::radio('division', $lang->project->divisionList, $project->division, $disabled);?>
<icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->project->divisionTips;?>"></icon>
</td>
</tr>
<?php endif;?>
<?php if($project->model == 'kanban'):?>