From 30e13a49c886038c8ef3ebcb81df4bdad20fdb50 Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Wed, 16 Dec 2020 14:22:32 +0800
Subject: [PATCH] * Finish task#8687.

---
 module/block/control.php                |  2 +-
 module/block/view/programblock.html.php | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/module/block/control.php b/module/block/control.php
index ca3e646c7c..77aa62b7a4 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -766,7 +766,7 @@ class block extends control
         $type    = isset($this->params->type)    ? $this->params->type    : 'all';
         $orderBy = isset($this->params->orderBy) ? $this->params->orderBy : 'id_desc';
 
-        $this->view->programs = $this->loadModel('program')->getPRJOverview('byStatus', $type, $orderBy, $count);
+        $this->view->projects = $this->loadModel('program')->getPRJOverview('byStatus', $type, $orderBy, $count);
         $this->view->users    = $this->loadModel('user')->getPairs('noletter');
     }
 
diff --git a/module/block/view/programblock.html.php b/module/block/view/programblock.html.php
index feda74486e..0308d121d2 100644
--- a/module/block/view/programblock.html.php
+++ b/module/block/view/programblock.html.php
@@ -1,4 +1,4 @@
-<?php if(empty($programs)): ?>
+<?php if(empty($projects)): ?>
 <div class='empty-tip'><?php echo $lang->block->emptyTip;?></div>
 <?php else:?>
 <style>
@@ -23,23 +23,23 @@
       </tr>
     </thead>
     <tbody>
-      <?php foreach($programs as $program):?>
+      <?php foreach($projects as $project):?>
       <?php
-      $viewLink = $this->createLink('program', 'index', "programID={$program->id}");
+      $viewLink = $this->createLink('program', 'index', "programID={$project->id}");
       ?>
       <tr>
-        <td title='<?php echo $program->name?>'><?php echo html::a($viewLink, $program->name);?></td>
-        <td><?php echo zget($users, $program->PM, $program->PM)?></td>
+        <td title='<?php echo $project->name?>'><?php echo html::a($viewLink, $project->name);?></td>
+        <td><?php echo zget($users, $project->PM, $project->PM)?></td>
         <td class='c-status'>
-          <span class="status-program status-<?php echo $program->status?>"><?php echo zget($lang->project->statusList, $program->status);?></span>
+          <span class="status-program status-<?php echo $project->status?>"><?php echo zget($lang->project->statusList, $project->status);?></span>
         </td>
         <?php if($longBlock):?>
-        <td><?php echo $program->teamCount;?></td>
-        <td><?php echo $program->consumed;?></td>
-        <td><?php echo $program->budget . ' ' . zget($lang->program->unitList, $program->budgetUnit);?></td>
-        <td><?php echo $program->leftStories;?></td>
-        <td><?php echo $program->leftTasks;?></td>
-        <td><?php echo $program->leftBugs;?></td>
+        <td><?php echo $project->teamCount;?></td>
+        <td><?php echo $project->consumed;?></td>
+        <td><?php echo $project->budget . ' ' . zget($lang->program->unitList, $project->budgetUnit);?></td>
+        <td><?php echo $project->leftStories;?></td>
+        <td><?php echo $project->leftTasks;?></td>
+        <td><?php echo $project->leftBugs;?></td>
         <?php endif;?>
       </tr>
       <?php endforeach;?>