Revert "* Finish task #64969."

This reverts commit bacc10ccc0.

framework/base/helper.class.php

@@ -885,8 +885,8 @@ function getWebRoot($full = false)
  *
  * @param  array|object    $var
  * @param  string|int      $key
- * @param  mixed           $valueWhenNone     value when the key not exists.
- * @param  mixed           $valueWhenExists   value when the key exists.
+ * @param  mixed           $valueWhenNone     value when the key not exits.
+ * @param  mixed           $valueWhenExists   value when the key exits.
  * @access public
  * @return mixed
  */

lib/dao/dao.class.php

@@ -29,7 +29,7 @@ class dao extends baseDAO
     /**
      * 设置需要更新或插入的数据。
      * Set the data to update or insert.
-     *
+     * 
      * @param  object $data  the data object or array
      * @access public
      * @return object the dao object self.
@@ -182,7 +182,7 @@ class dao extends baseDAO
 
     /**
      * Check workFlow field rule.
-     *
+     * 
      * @access public
      * @return object the dao object self.
      */
@@ -232,10 +232,10 @@ class dao extends baseDAO
     }
 
     /**
-     * 检查工作流扩展字段
-     * check workflow extend field
-     *
-     * @param  array $fields
+     * 检查工作流扩展字段 
+     * check workflow extend field 
+     * 
+     * @param  array $fields 
      * @access public
      * @return object the dao object self
      */

module/action/control.php

@@ -52,8 +52,6 @@ class action extends control
     public function trash($browseType = 'all', $type = 'all', $byQuery = false, $queryID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $this->loadModel('backup');
-        $this->app->loadLang('execution');
-        $this->app->loadLang('project');
 
         /* Save session. */
         $uri = $this->app->getURI(true);
@@ -117,15 +115,6 @@ class action extends control
             $preferredType   = $preferredType + $toPreferredType;
         }
 
-        /* Get the project name of executions. */
-        if($browseType == 'execution')
-        {
-            $executionIdList = array();
-            foreach($trashes as $trash) $executionIdList[] = $trash->objectID;
-            $projectPairs = $this->loadModel('project')->getProjectName($executionIdList);
-            $this->view->projectPairs = $projectPairs;
-        }
-
         /* Title and position. */
         $this->view->title      = $this->lang->action->trash;
         $this->view->position[] = $this->lang->action->trash;
@@ -141,6 +130,7 @@ class action extends control
         $this->view->preferredTypeConfig = $preferredTypeConfig;
         $this->view->byQuery             = $byQuery;
         $this->view->queryID             = $queryID;
+
         $this->display();
     }
 

module/action/view/trash.html.php

@@ -82,7 +82,6 @@
           <th class='c-object-type'><?php common::printOrderLink('objectType', $orderBy, $vars, $lang->action->objectType);?></th>
           <th class='c-id'><?php common::printOrderLink('objectID', $orderBy, $vars, $lang->idAB);?></th>
           <th><?php echo $lang->action->objectName;?></th>
-          <th class='w-250px'><?php if($currentObjectType == 'execution') echo $this->lang->execution->project;?></th>
           <th class='c-user'><?php common::printOrderLink('actor', $orderBy, $vars, $lang->action->actor);?></th>
           <th class='c-full-date'><?php common::printOrderLink('date', $orderBy, $vars, $lang->action->date);?></th>
           <th class='c-actions'><?php echo $lang->actions;?></th>
@@ -136,14 +135,6 @@
             }
             ?>
           </td>
-          <td>
-            <?php if($currentObjectType == 'execution'):?>
-            <span title='<?php echo $projectPairs[$action->project]->name;?>'><?php echo $projectPairs[$action->project]->name;?></span>
-            <?php if($projectPairs[$action->project]->deleted):?>
-            <span class='label label-danger'><?php echo $this->lang->project->deleted;?></span>
-            <?php endif; ?>
-            <?php endif; ?>
-          </td>
           <td><?php echo zget($users, $action->actor);?></td>
           <td><?php echo $action->date;?></td>
           <td>

module/project/model.php

@@ -2613,14 +2613,5 @@ class projectModel extends model
         }
 
         return $menu;
-
     }
-    public function getProjectName($executionIdList)
-    {
-        return $this->dao->select('t1.id, t2.id as projectID, t2.name, t2.deleted')->from(TABLE_EXECUTION)->alias('t1')
-            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
-            ->where('t1.id')->in($executionIdList)
-            ->fetchAll('projectID');
-    }
-
 }