* finish task #7645.

module/program/control.php

@@ -491,18 +491,18 @@ class program extends control
      * @access public
      * @return void
      */
-    public function delete($projectID, $confirm = 'no')
+    public function delete($programID, $confirm = 'no')
     {
-        if($confirm == 'no')
-        {
-            echo js::confirm(sprintf($this->lang->project->confirmDelete, $this->projects[$projectID]), $this->createLink('project', 'delete', "projectID=$projectID&confirm=yes"));
-            exit;
-        }
-        else
-        {
-            $this->project->delete(TABLE_PROJECT, $projectID);
-            die(js::locate(inlink('browse'), 'parent'));
-        }
+        $childrenCount = $this->dao->select('count(*) as count')->from(TABLE_PROJECT)->where('parent')->eq($programID)->andWhere('template')->ne('')->andWhere('deleted')->eq(0)->fetch('count');
+        if($childrenCount) die(js::alert($this->lang->program->hasChildren));
+
+        $program = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($programID)->fetch();
+        if($confirm == 'no') die(js::confirm(sprintf($this->lang->program->confirmDelete, $program->name), $this->createLink('program', 'delete', "programID=$programID&confirm=yes")));
+
+        $this->dao->update(TABLE_PROJECT)->set('deleted')->eq(1)->where('id')->eq($programID)->exec();
+        $this->loadModel('action')->create('program', $programID, 'deleted', '', $extra = ACTIONMODEL::CAN_UNDELETED);
+
+        die(js::reload('parent'));
     }
 
     /**

module/program/css/browse.css

@@ -26,4 +26,4 @@
 #cards .pager {margin: 0; float: right;}
 #cards .pager .btn{border: none}
 
-.w-215px{width:215px;}
+.w-240px{width:240px;}

module/program/lang/zh-cn.php

@@ -77,6 +77,11 @@ $lang->program->aclList['custom']  = "自定义白名单(团队成员和白名
 $lang->program->privwayList['extend'] = '继承(取项目权限与组织权限的并集)';
 $lang->program->privwayList['reset']  = '重新定义(只取项目权限)';
 
+$lang->program->statusList['wait']      = '未开始';
+$lang->program->statusList['doing']     = '进行中';
+$lang->program->statusList['suspended'] = '已挂起';
+$lang->program->statusList['closed']    = '已关闭';
+
 $lang->program->noProgram          = '暂时没有项目';
 $lang->program->accessDenied       = '您无权访问该项目！';
 $lang->program->chooseProgramType  = '选择项目管理方式';
@@ -91,4 +96,6 @@ $lang->program->scrumDesc          = '<strong>简介：</strong>小步迭代，
 $lang->program->cmmi               = '瀑布';
 $lang->program->cmmiTitle          = '瀑布式项目管理';
 $lang->program->cmmiDesc           = '<strong>简介：</strong>按阶段规范化管理<br><strong>包含功能点：</strong>估算、计划、阶段、报告';
-$lang->program->cannotCreateChild = '该项目已经有实际的内容，无法直接添加子项目。您可以为当前项目创建一个父项目，然后在新的父项目下面添加子项目。';
+$lang->program->cannotCreateChild  = '该项目已经有实际的内容，无法直接添加子项目。您可以为当前项目创建一个父项目，然后在新的父项目下面添加子项目。';
+$lang->program->hasChildren        = '该项目有子项目存在，不能删除。';
+$lang->program->confirmDelete      = "您确定删除项目[%s]吗？";

module/program/view/browsebylist.html.php

@@ -14,7 +14,7 @@
         <th class='w-100px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->program->end);?></th>
         <th class='w-100px'><?php common::printOrderLink('budget', $orderBy, $vars, $lang->program->budget);?></th>
         <th class='w-100px'><?php common::printOrderLink('PM', $orderBy, $vars, $lang->program->PM);?></th>
-        <th class='text-center w-215px'><?php echo $lang->actions;?></th>
+        <th class='text-center w-240px'><?php echo $lang->actions;?></th>
         <?php if($canOrder):?>
         <th class='w-60px sort-default'><?php common::printOrderLink('order', $orderBy, $vars, $lang->project->orderAB);?></th>
         <?php endif;?>
@@ -44,6 +44,7 @@
           <?php common::printIcon('program', 'close', "projectID=$project->id", $project, 'list', '', '', 'iframe', true);?>
           <?php if(common::hasPriv('program', 'edit')) echo html::a($this->createLink("program", "edit", "projectID=$project->id"), "<i class='icon-edit'></i>", '', "class='btn' title='{$lang->edit}'");?>
           <?php common::printIcon('program', 'create', "template=&projectID=$project->id", '', 'list', 'treemap-alt', '', '', '', '', $this->lang->program->children);?>
+          <?php if(common::hasPriv('program', 'delete')) echo html::a($this->createLink("program", "delete", "projectID=$project->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$lang->delete}'");?>
         </td>
         <?php if($canOrder):?>
         <td class='sort-handler'><i class="icon icon-move"></i></td>