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

Merge branch 'sprint/176_xieqiyu_45536' into 'master'

Browse Source 
Sprint/176 xieqiyu 45536

See merge request easycorp/zentaopms!884
This commit is contained in:
朱金勇
2021-12-10 06:15:15 +00:00
parent e8feeca41e 581284cf4e
commit 161233a64f
22 changed files with 148 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/program/view/browse.html.php
+1 -1
View File
@@ -29,7 +29,7 @@
<?php if(common::hasPriv('project', 'batchEdit') and $programType != 'bygrid') echo html::checkbox('editProject', array('1' => $lang->project->edit), '', $this->cookie->editProject ? 'checked=checked' : '');?>
</div>
<div class='pull-right'>
<?php common::printLink('project', 'createGuide', "programID=0&from=PGM", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-secondary" data-toggle="modal" data-target="#guideDialog"');?>
<?php if(common::hasPriv('project', 'create')) common::printLink('project', 'createGuide', "programID=0&from=PGM", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-secondary" data-toggle="modal" data-target="#guideDialog"');?>
<?php if(isset($lang->pageActions)) echo $lang->pageActions;?>
</div>
</div>
module/program/view/project.html.php
+1 -1
View File
@@ -30,7 +30,7 @@ js::set('browseType', $browseType);
<?php echo html::checkbox('involved ', array('1' => $lang->project->mine), '', $this->cookie->involved ? 'checked=checked' : '');?>
</div>
<div class="btn-toolbar pull-right">
<?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-primary" data-toggle="modal" data-target="#guideDialog"');?>
<?php if(common::hasPriv('project', 'create')) common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-primary" data-toggle="modal" data-target="#guideDialog"');?>
</div>
</div>
<div id='mainContent' class="main-row fade">