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

Remove the unused code.

Browse Source
This commit is contained in:
dongli
2022-08-19 07:10:46 +00:00
parent 71c48926fd 730c638598
commit 37cf24c795
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/control.php
+9
View File
@@ -115,6 +115,11 @@ class action extends control
$preferredType = $preferredType + $toPreferredType;
}
<<<<<<< HEAD
=======
<<<<<<< Updated upstream
=======
>>>>>>> 730c63859893f773f598f4b484b2c349bebd23cd
/* Get the project name of executions. */
if($browseType == 'execution')
{
@@ -125,6 +130,10 @@ class action extends control
$this->view->projectList = $projectList;
}
<<<<<<< HEAD
=======
>>>>>>> Stashed changes
>>>>>>> 730c63859893f773f598f4b484b2c349bebd23cd
/* Title and position. */
$this->view->title = $this->lang->action->trash;
$this->view->position[] = $this->lang->action->trash;
module/action/view/trash.html.php
+3 -14
View File
@@ -85,20 +85,9 @@
<?php if($config->systemMode == 'new' and $currentObjectType == 'execution'):?>
<th class='w-250px'><?php echo $this->lang->execution->project;?></th>
<?php endif;?>
<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>
</tr>
</thead>
<tbody>
<?php foreach($trashes as $action):?>
<?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?>
<tr>
<td><?php echo zget($lang->action->objectTypes, $action->objectType, '');?></td>
<td><?php echo $action->objectID;?></td>
<td class='text-left'>
<?php
$params = $action->objectType == 'user' ? "account={$action->objectName}" : "id={$action->objectID}";
<?php if($config->systemMode == 'new' and $currentObjectType == 'execution'):?>
<th class='w-250px'><?php echo $this->lang->execution->project;?></th>
<?php endif;?> <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> </tr> </thead> <tbody> <?php foreach($trashes as $action):?> <?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?> <tr> <td><?php echo zget($lang->action->objectTypes, $action->objectType, '');?></td> <td><?php echo $action->objectID;?></td> <td class='text-left'> <?php $params = $action->objectType == 'user' ? "account={$action->objectName}" : "id={$action->objectID}";
$methodName = 'view';
if($module == 'caselib')
{