Merge branch 'master' into 'sprint/191_zhouxin_54352'

# Conflicts: # module/datatable/config.php
2022-05-19 03:18:24 +00:00
parent f08ea8b043 aa81ba0c65
commit 6f150a9ea8
52 changed files with 528 additions and 158 deletions
@@ -25,7 +25,7 @@
    </div>
    <form class='load-indicator main-form form-ajax' method='post' target='hiddenwin' id='dataform'>
      <table class='table table-form'>
-        <?php if($config->systemMode == 'new'):?>
+        <?php if($config->systemMode == 'new' and isset($project) and $project->model == 'scrum'):?>
        <tr>
          <th class='w-120px'><?php echo $lang->execution->projectName;?></th>
          <td><?php echo html::select('project', $allProjects, $execution->project, "class='form-control chosen' onchange='changeProject(this.value)' required");?></td><td></td>