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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2019-08-14 09:00:49 +08:00
parent 010e585550 fd0272d7da
commit fa600971b5
55 changed files with 106 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/control.class.php
+10 -5
View File
@@ -185,16 +185,21 @@ class control extends baseControl
/**
* Print extend fields.
*
* @param object $object bug | build | feedback | product | productplan | project | release | story | task | testcase | testsuite | testtask
* @param string $type table | div
* @param string $extras columns=1,mode=value,position=right|right|all
* @param object $object bug | build | feedback | product | productplan | project | release | story | task | testcase | testsuite | testtask
* @param string $type The parent component which fileds displayed in. It should be table or div.
* @param string $extras The extra params.
* columns=2|3|5 Number of the columns merged to display the fields. The default is 1.
* position=left|right The position which the fields displayed in a page.
* inForm=0|1 The fields displayed in a form or not. The default is 1.
* inCell=0|1 The fields displayed in a div with class cell or not. The default is 0.
* @access public
* @return void
*/
public function printExtendFields($object, $type, $extras)
public function printExtendFields($object, $type, $extras = '')
{
if(!isset($this->config->bizVersion)) return false;
$this->loadModel('flow')->printFields($this->moduleName, $this->methodName, $object, $type, $extras);
echo $this->loadModel('flow')->printFields($this->moduleName, $this->methodName, $object, $type, $extras);
}
/**
module/bug/view/activate.html.php
+1 -1
View File
@@ -34,7 +34,7 @@
<th><?php echo $lang->bug->status;?></th>
<td><?php echo html::hidden('status', 'active');?></td>
</tr>
<?php $this->printExtendFields($bug, 'table', 'columns=1');?>
<?php $this->printExtendFields($bug, 'table');?>
<tr>
<th><?php echo $lang->bug->openedBuild;?></th>
<td colspan='2'><?php echo html::select('openedBuild[]', $builds, $bug->openedBuild, 'size=4 multiple=multiple class="form-control chosen"');?></td>
module/bug/view/assignto.html.php
+1 -1
View File
@@ -38,7 +38,7 @@ js::set('page', 'assignedto');
<th><?php echo $lang->bug->status;?></th>
<td><?php echo html::hidden('status', $bug->status);?></td>
</tr>
<?php $this->printExtendFields($bug, 'table', 'columns=1');?>
<?php $this->printExtendFields($bug, 'table');?>
<tr>
<th><?php echo $lang->bug->mailto;?></th>
<td colspan='2'><?php echo html::select('mailto[]', $users, str_replace(' ', '', $bug->mailto), 'class="form-control chosen" multiple');?></td>
module/bug/view/close.html.php
+1 -1
View File
@@ -30,7 +30,7 @@
<th class='w-60px'><?php echo $lang->bug->status;?></th>
<td><?php echo html::hidden('status', 'closed');?></td>
</tr>
<?php $this->printExtendFields($bug, 'table', 'columns=1');?>
<?php $this->printExtendFields($bug, 'table');?>
<tr>
<th class='w-60px'><?php echo $lang->comment;?></th>
<td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
module/bug/view/confirmbug.html.php
+1 -1
View File
@@ -50,7 +50,7 @@ js::set('page', 'confirmbug');
<td><?php echo html::hidden('status', $bug->status);?></td>
<td></td>
</tr>
<?php $this->printExtendFields($bug, 'table', 'columns=1');?>
<?php $this->printExtendFields($bug, 'table');?>
<tr>
<th><?php echo $lang->bug->mailto;?></th>
<td colspan='2'><?php echo html::select('mailto[]', $users, str_replace(' ' , '', $bug->mailto), 'class="form-control chosen" multiple');?></td>
module/bug/view/create.html.php
+1 -1
View File
@@ -292,7 +292,7 @@ js::set('flow', $config->global->flow);
<th><?php echo $lang->bug->status;?></th>
<td><?php echo html::hidden('status');?></td>
</tr>
<?php $this->printExtendFields('', 'table', 'columns=1');?>
<?php $this->printExtendFields('', 'table');?>
<tr>
<th><?php echo $lang->bug->files;?></th>
<td colspan='2'><?php echo $this->fetch('file', 'buildform', 'fileCount=1&percent=0.85');?></td>
module/bug/view/edit.html.php
+2 -2
View File
@@ -62,7 +62,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<?php echo html::textarea('comment', '', "rows='5' class='form-control kindeditor' hidefocus='true'");?>
</div>
</div>
<?php $this->printExtendFields($bug, 'div', 'position=left&divCell=false');?>
<?php $this->printExtendFields($bug, 'div', 'position=left');?>
<div class="detail">
<div class="detail-title"><?php echo $lang->files;?></div>
<div class='detail-content'><?php echo $this->fetch('file', 'buildform');?></div>
@@ -297,7 +297,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
</tbody>
</table>
</div>
<?php $this->printExtendFields($bug, 'div', 'position=right&divCell=false');?>
<?php $this->printExtendFields($bug, 'div', 'position=right');?>
</div>
</div>
</div>
module/bug/view/resolve.html.php
+1 -1
View File
@@ -77,7 +77,7 @@ js::set('productID' , $bug->product);
<th><?php echo $lang->bug->status;?></th>
<td><?php echo html::hidden('status', 'resolved');?></td>
</tr>
<?php $this->printExtendFields($bug, 'table', 'columns=1');?>
<?php $this->printExtendFields($bug, 'table');?>
<tr>
<th><?php echo $lang->bug->files;?></th>
<td colspan='2'><?php echo $this->fetch('file', 'buildform', 'fileCount=1&percent=0.85');?></td>
module/bug/view/view.html.php
+2 -2
View File
@@ -58,7 +58,7 @@
<?php echo $this->fetch('file', 'printFiles', array('files' => $bug->files, 'fieldset' => 'true'));?>
<?php $actionFormLink = $this->createLink('action', 'comment', "objectType=bug&objectID=$bug->id");?>
</div>
<?php $this->printExtendFields($bug, 'div', "position=left&divCell=true");?>
<?php $this->printExtendFields($bug, 'div', "position=left&inForm=0&inCell=1");?>
<div class='cell'><?php include '../../common/view/action.html.php';?></div>
<?php
$params = "bugID=$bug->id";
@@ -376,7 +376,7 @@
</div>
</div>
</div>
<?php $this->printExtendFields($bug, 'div', "position=right&mode=value");?>
<?php $this->printExtendFields($bug, 'div', "position=right&inForm=0&inCell=1");?>
</div>
</div>
module/build/view/view.html.php
+1 -1
View File
@@ -335,7 +335,7 @@ tbody tr td:first-child input{display:none;}
<th><?php echo $lang->build->filePath;?></th>
<td style='word-break:break-all;'><?php echo html::a($build->filePath, $build->filePath, '_blank');?></td>
</tr>
<?php $this->printExtendFields($build, 'table', "position=all&columns=1");?>
<?php $this->printExtendFields($build, 'table', 'inForm=0');?>
<?php if($config->global->flow != 'onlyTest'):?>
<tr>
<th style="vertical-align:top"><?php echo $lang->build->desc;?></th>
module/group/css/managepriv.css
+3
View File
@@ -6,3 +6,6 @@
#mainMenu #groupName{line-height:33px; float: left}
.checkbox-right{padding-left:0px !important;}
td.menus {border-right: 0;padding-right: 0;width: 220px !important;}
td.menus + td {border-left: 0;}
module/group/view/privbygroup.html.php
+25 -3
View File
@@ -73,7 +73,7 @@
<thead>
<tr class='text-center'>
<th class='thWidth'><?php echo $lang->group->module;?></th>
<th><?php echo $lang->group->method;?></th>
<th colspan='2'><?php echo $lang->group->method;?></th>
</tr>
</thead>
<?php foreach($lang->resource as $moduleName => $moduleActions):?>
@@ -102,7 +102,13 @@
<label class='text-right' for='allChecker<?php echo $moduleName;?>'><?php echo $lang->$moduleName->common;?></label>
</div>
</th>
<td id='<?php echo $moduleName;?>' class='pv-10px'>
<?php if(isset($lang->$moduleName->menus)):?>
<td class='menus'>
<?php echo html::checkbox("actions[$moduleName]", array('browse' => $lang->$moduleName->browse), isset($groupPrivs[$moduleName]) ? $groupPrivs[$moduleName] : '');?>
<?php echo html::checkbox("actions[$moduleName]", $lang->$moduleName->menus, isset($groupPrivs[$moduleName]) ? $groupPrivs[$moduleName] : '');?>
</td>
<?php endif;?>
<td id='<?php echo $moduleName;?>' class='pv-10px' colspan='<?php echo !empty($lang->$moduleName->menus) ? 1 : 2?>'>
<?php $i = 1;?>
<?php if($moduleName == 'caselib') $moduleName = 'testsuite';?>
<?php foreach($moduleActions as $action => $actionLabel):?>
@@ -121,7 +127,7 @@
<label class='text-right' for='allChecker'><?php echo $lang->selectAll;?></label>
</div>
</th>
<td class='form-actions'>
<td class='form-actions' colspan='2'>
<?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
<?php echo html::backButton();?>
<?php echo html::hidden('noChecked'); // Save the value of no checked.?>
@@ -133,3 +139,19 @@
<?php endif;?>
<?php js::set('groupID', $groupID);?>
<?php js::set('menu', $menu);?>
<script>
$(document).ready(function()
{
$('.menus input[value=browse]').change(function()
{
$(this).parents('.menus').find('[name^=actions]').prop('checked', $(this).prop('checked'));
});
$('.menus input[name^=actions]:not(input[value=browse])').click(function()
{
var $parent = $(this).parents('.menus');
$parent.find('input[value=browse]').prop('checked', $parent.find('input[name^=actions]:not(input[value=browse]):checked').length > 0);
})
});
</script>
module/product/view/close.html.php
+1 -1
View File
@@ -28,7 +28,7 @@
<th class='w-40px'><?php echo $lang->product->status;?></th>
<td><?php echo html::hidden('status', $product->status);?></td>
</tr>
<?php $this->printExtendFields($product, 'table', 'columns=1');?>
<?php $this->printExtendFields($product, 'table');?>
<tr>
<th class='w-40px'><?php echo $lang->comment;?></th>
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
module/product/view/create.html.php
+1 -1
View File
@@ -66,7 +66,7 @@
<td><?php echo html::hidden('status', 'normal');?></td>
<td></td>
</tr>
<?php $this->printExtendFields('', 'table', 'columns=1');?>
<?php $this->printExtendFields('', 'table');?>
<tr>
<th><?php echo $lang->product->desc;?></th>
<td colspan='2'>
module/product/view/edit.html.php
+1 -1
View File
@@ -58,7 +58,7 @@
<th><?php echo $lang->product->status;?></th>
<td><?php echo html::select('status', $lang->product->statusList, $product->status, "class='form-control'");?></td><td></td>
</tr>
<?php $this->printExtendFields($product, 'table', 'columns=1');?>
<?php $this->printExtendFields($product, 'table');?>
<tr>
<th><?php echo $lang->product->desc;?></th>
<td colspan='2'><?php echo html::textarea('desc', htmlspecialchars($product->desc), "rows='8' class='form-control'");?></td>
module/product/view/view.html.php
+2 -2
View File
@@ -75,7 +75,7 @@
</div>
</div>
</div>
<?php $this->printExtendFields($product, 'div', "position=left&divCell=false");?>
<?php $this->printExtendFields($product, 'div', "position=left&inForm=0");?>
<div class="col-sm-12">
<?php $blockHistory = true;?>
<?php $actionFormLink = $this->createLink('action', 'comment', "objectType=product&objectID=$product->id");?>
@@ -236,7 +236,7 @@
</div>
</div>
<?php endif;?>
<?php $this->printExtendFields($product, 'div', "position=right&mode=value");?>
<?php $this->printExtendFields($product, 'div', "position=right&inForm=0&inCell=1");?>
</div>
</div>
</div>
module/productplan/view/edit.html.php
+1 -1
View File
@@ -52,7 +52,7 @@
<td><?php echo html::input('end', $plan->end != '2030-01-01' ? formatTime($plan->end) : '', 'class="form-control form-date"');?></td>
<td colspan='2'><?php echo html::radio('delta', $lang->productplan->endList , '', "onclick='computeEndDate(this.value)'");?></td>
</tr>
<?php $this->printExtendFields($plan, 'table', 'columns=1');?>
<?php $this->printExtendFields($plan, 'table');?>
<tr>
<th><?php echo $lang->productplan->desc;?></th>
<td colspan='3'><?php echo html::textarea('desc', htmlspecialchars($plan->desc), "rows='10' class='form-control kindeditor' hidefocus='true'");?></td>
module/productplan/view/view.html.php
+1 -1
View File
@@ -455,7 +455,7 @@
</td>
</tr>
<?php endif;?>
<?php $this->printExtendFields($plan, 'table', "position=all&columns=1");?>
<?php $this->printExtendFields($plan, 'table', 'inForm=0');?>
<tr>
<th><?php echo $lang->productplan->desc;?></th>
<td><?php echo $plan->desc;?></td>
module/project/view/close.html.php
+1 -1
View File
@@ -29,7 +29,7 @@
<th class='w-50px'><?php echo $lang->project->status;?></th>
<td><?php echo html::hidden('status', 'closed');?></td>
</tr>
<?php $this->printExtendFields($project, 'table', 'columns=1');?>
<?php $this->printExtendFields($project, 'table');?>
<tr>
<th class='w-50px'><?php echo $lang->comment;?></th>
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
module/project/view/create.html.php
+1 -1
View File
@@ -88,7 +88,7 @@
<td></td>
<td></td>
</tr>
<?php $this->printExtendFields('', 'table', 'columns=1');?>
<?php $this->printExtendFields('', 'table');?>
<tr <?php if($config->global->flow == 'onlyTask') echo "class='hidden'";?>>
<th><?php echo $lang->project->manageProducts;?></th>
<td class='text-left' id='productsBox' colspan="3">
module/project/view/edit.html.php
+1 -1
View File
@@ -150,7 +150,7 @@
<th><?php echo $lang->project->desc;?></th>
<td colspan='2'><?php echo html::textarea('desc', htmlspecialchars($project->desc), "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
</tr>
<?php $this->printExtendFields($project, 'table', 'columns=1');?>
<?php $this->printExtendFields($project, 'table');?>
<tr>
<th><?php echo $lang->project->acl;?></th>
<td colspan='2'><?php echo nl2br(html::radio('acl', $lang->project->aclList, $project->acl, "onclick='setWhite(this.value);'", 'block'));?></td>
module/project/view/suspend.html.php
+1 -1
View File
@@ -28,7 +28,7 @@
<th><?php echo $lang->project->status;?></th>
<td><?php echo html::hidden('status', 'suspended');?></td>
</tr>
<?php $this->printExtendFields($project, 'table', 'columns=1');?>
<?php $this->printExtendFields($project, 'table');?>
<tr>
<th class='w-50px'><?php echo $lang->comment;?></th>
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
module/project/view/view.html.php
+2 -2
View File
@@ -140,7 +140,7 @@
</div>
</div>
</div>
<?php $this->printExtendFields($project, 'div', "position=left&divCell=false");?>
<?php $this->printExtendFields($project, 'div', "position=left&inForm=0");?>
<div class="col-sm-12">
<?php $blockHistory = true;?>
<?php $actionFormLink = $this->createLink('action', 'comment', "objectType=project&objectID=$project->id");?>
@@ -295,7 +295,7 @@
<?php endif;?>
</div>
</div>
<?php $this->printExtendFields($project, 'div', "position=right&mode=value");?>
<?php $this->printExtendFields($project, 'div', "position=right&inForm=0&inCell=1");?>
</div>
</div>
</div>
module/release/view/create.html.php
+1 -1
View File
@@ -44,7 +44,7 @@
<td><?php echo html::hidden('status', 'normal', "disabled");?></td>
<td></td>
</tr>
<?php $this->printExtendFields('', 'table', 'columns=1');?>
<?php $this->printExtendFields('', 'table');?>
<tr>
<th><?php echo $lang->release->desc;?></th>
<td colspan='2'><?php echo html::textarea('desc', '', "rows='10' class='form-control kindeditor' hidefocus='true'");?></td>
module/release/view/edit.html.php
+1 -1
View File
@@ -47,7 +47,7 @@
<th><?php echo $lang->release->status;?></th>
<td><?php echo html::select('status', $lang->release->statusList, $release->status, "class='form-control'");?></td><td></td>
</tr>
<?php $this->printExtendFields($release, 'table', 'columns=1');?>
<?php $this->printExtendFields($release, 'table');?>
<tr>
<th><?php echo $lang->release->desc;?></th>
<td colspan='2'><?php echo html::textarea('desc', htmlspecialchars($release->desc), "rows=10 class='form-control kindeditor' hidefocus='true'");?></td>
module/release/view/view.html.php
+1 -1
View File
@@ -330,7 +330,7 @@
<th><?php echo $lang->release->date;?></th>
<td><?php echo $release->date;?></td>
</tr>
<?php $this->printExtendFields($release, 'table', "position=all&columns=1");?>
<?php $this->printExtendFields($release, 'table', 'inForm=0');?>
<tr>
<th><?php echo $lang->release->desc;?></th>
<td><?php echo $release->desc;?></td>
module/story/view/activate.html.php
+1 -1
View File
@@ -38,7 +38,7 @@
?>
</td>
</tr>
<?php $this->printExtendFields($story, 'table', 'columns=1');?>
<?php $this->printExtendFields($story, 'table');?>
<tr>
<th><?php echo $lang->story->comment;?></th>
<td colspan='2'><?php echo html::textarea('comment', '', 'rows=5 class="area-1"');?></td>
module/story/view/assignto.html.php
+1 -1
View File
@@ -33,7 +33,7 @@
<th><?php echo $lang->story->status;?></th>
<td><?php echo html::hidden('status', $story->status);?></td>
</tr>
<?php $this->printExtendFields($story, 'table', 'columns=1');?>
<?php $this->printExtendFields($story, 'table');?>
<tr>
<th><?php echo $lang->comment;?></th>
<td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control w-p98'");?></td>
module/story/view/change.html.php
+1 -1
View File
@@ -40,7 +40,7 @@
<th><?php echo $lang->story->status;?></th>
<td><?php echo html::hidden('status', $story->status);?></td>
</tr>
<?php $this->printExtendFields($story, 'table', 'columns=1');?>
<?php $this->printExtendFields($story, 'table');?>
<tr>
<th><?php echo $lang->story->title;?></th>
<td colspan='2'><?php echo html::input('title', $story->title, 'class="form-control"');?></td>
module/story/view/close.html.php
+1 -1
View File
@@ -40,7 +40,7 @@
<th><?php echo $lang->story->status;?></th>
<td><?php echo html::hidden('status', 'closed');?></td>
</tr>
<?php $this->printExtendFields($story, 'table', 'columns=1');?>
<?php $this->printExtendFields($story, 'table');?>
<tr>
<th><?php echo $lang->story->comment;?></th>
<td colspan='2'><?php echo html::textarea('comment', '', "rows='8' class='form-control'");?></td>
module/story/view/create.html.php
+1 -1
View File
@@ -177,7 +177,7 @@
<th><?php echo $lang->story->status;?></th>
<td><?php echo html::hidden('status', 'draft');?></td>
</tr>
<?php $this->printExtendFields('', 'table', 'columns=1');?>
<?php $this->printExtendFields('', 'table');?>
<tr>
<th><?php echo $lang->story->legendAttatch;?></th>
<td colspan='4'><?php echo $this->fetch('file', 'buildform');?></td>
module/story/view/edit.html.php
+2 -2
View File
@@ -43,7 +43,7 @@
<div class='detail-title'><?php echo $lang->story->verify;?></div>
<div class='detail-content article-content'><?php echo $story->verify;?></div>
</div>
<?php $this->printExtendFields($story, 'div', 'position=left&divCell=false');?>
<?php $this->printExtendFields($story, 'div', 'position=left');?>
<div class='detail'>
<div class='detail-title'><?php echo $lang->story->comment;?></div>
<div class='form-group'>
@@ -200,7 +200,7 @@
</table>
</div>
<?php $this->printExtendFields($story, 'div', 'position=right&divCell=false');?>
<?php $this->printExtendFields($story, 'div', 'position=right');?>
<div class='detail'>
<div class='detail-title'><?php echo $lang->story->legendMisc;?></div>
module/story/view/review.html.php
+1 -1
View File
@@ -68,7 +68,7 @@ var assignedTo = '<?php $story->lastEditedBy ? print($story->lastEditedBy) : pri
<th><?php echo $lang->story->status;?></th>
<td><?php echo html::hidden('status', $story->status);?></td>
</tr>
<?php $this->printExtendFields($story, 'table', 'columns=1');?>
<?php $this->printExtendFields($story, 'table');?>
<tr>
<th><?php echo $lang->story->reviewedBy;?></th>
<td colspan='2'><?php echo html::select('reviewedBy[]', $users, $app->user->account, "class='form-control' multiple data-placeholder='{$lang->story->chosen->reviewedBy}'");?></td>
module/story/view/view.html.php
+2 -2
View File
@@ -62,7 +62,7 @@
<?php echo $this->fetch('file', 'printFiles', array('files' => $story->files, 'fieldset' => 'true'));?>
<?php $actionFormLink = $this->createLink('action', 'comment', "objectType=story&objectID=$story->id");?>
</div>
<?php $this->printExtendFields($story, 'div', "position=left&divCell=true");?>
<?php $this->printExtendFields($story, 'div', "position=left&inForm=0&inCell=1");?>
<div class="cell"><?php include '../../common/view/action.html.php';?></div>
<div class='main-actions'>
<div class="btn-toolbar">
@@ -387,7 +387,7 @@
</div>
</div>
</div>
<?php $this->printExtendFields($story, 'div', "position=right&mode=value");?>
<?php $this->printExtendFields($story, 'div', "position=right&inForm=0&inCell=1");?>
</div>
</div>
module/task/view/cancel.html.php
+1 -1
View File
@@ -30,7 +30,7 @@
<th><?php echo $lang->task->status;?></th>
<td><?php echo html::hidden('status', 'cancel');?></td>
</tr>
<?php $this->printExtendFields($task, 'table', 'columns=1');?>
<?php $this->printExtendFields($task, 'table');?>
<tr>
<th class='w-50px'><?php echo $lang->comment;?></th>
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
module/task/view/close.html.php
+1 -1
View File
@@ -30,7 +30,7 @@
<th><?php echo $lang->task->status;?></th>
<td><?php echo html::hidden('status', 'closed');?></td>
</tr>
<?php $this->printExtendFields($task, 'table', 'columns=1');?>
<?php $this->printExtendFields($task, 'table');?>
<tr>
<th class='w-50px'><?php echo $lang->comment;?></th>
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
module/task/view/create.html.php
+1 -1
View File
@@ -63,7 +63,7 @@
<th><?php echo $lang->task->status;?></th>
<td><?php echo html::hidden('status', 'wait');?></td>
</tr>
<?php $this->printExtendFields('', 'table', 'columns=1');?>
<?php $this->printExtendFields('', 'table');?>
<?php if(strpos(",$showFields,", ',story,') !== false and $config->global->flow != 'onlyTask' and $project->type != 'ops'):?>
<tr>
<th><?php echo $lang->task->story;?></th>
module/task/view/edit.html.php
+2 -3
View File
@@ -69,7 +69,7 @@
<div class='detail-title'><?php echo $lang->comment;?></div>
<div class='detail-content'><?php echo html::textarea('comment', '', "rows='5' class='form-control'");?></div>
</div>
<?php $this->printExtendFields($task, 'div', 'position=left&divCell=false');?>
<?php $this->printExtendFields($task, 'div', 'position=left');?>
<div class='detail'>
<div class='detail-title'><?php echo $lang->files;?></div>
<div class='detail-content'><?php echo $this->fetch('file', 'buildform');?></div>
@@ -215,7 +215,7 @@
</tr>
</table>
</div>
<?php $this->printExtendFields($task, 'div', 'position=right&divCell=false');?>
<?php $this->printExtendFields($task, 'div', 'position=right');?>
</div>
</div>
</div>
@@ -274,7 +274,6 @@
</tfoot>
</table>
</div>
<?php $this->printExtendFields($task, 'div', 'position=left&divCell=false');?>
</div>
</div>
</form>
module/task/view/pause.html.php
+1 -1
View File
@@ -38,7 +38,7 @@
<th><?php echo $lang->task->status;?></th>
<td><?php echo html::hidden('status', 'pause');?></td>
</tr>
<?php $this->printExtendFields($task, 'table', 'columns=1');?>
<?php $this->printExtendFields($task, 'table');?>
<tr>
<th class='w-60px'><?php echo $lang->comment;?></th>
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
module/task/view/view.html.php
+2 -2
View File
@@ -145,7 +145,7 @@
<?php echo $this->fetch('file', 'printFiles', array('files' => $task->files, 'fieldset' => 'true'));?>
<?php $actionFormLink = $this->createLink('action', 'comment', "objectType=task&objectID=$task->id");?>
</div>
<?php $this->printExtendFields($task, 'div', "position=left&divCell=true");?>
<?php $this->printExtendFields($task, 'div', "position=left&inForm=0&inCell=1");?>
<div class="cell"><?php include '../../common/view/action.html.php';?></div>
<div class='main-actions'>
<div class="btn-toolbar">
@@ -376,7 +376,7 @@
</div>
</details>
</div>
<?php $this->printExtendFields($task, 'div', "position=right&mode=value");?>
<?php $this->printExtendFields($task, 'div', "position=right&inForm=0&inCell=1");?>
</div>
</div>
module/testcase/view/create.html.php
+1 -1
View File
@@ -210,7 +210,7 @@
<th><?php echo $lang->testcase->status;?></th>
<td><?php echo html::hidden('status', 'normal');?></td>
</tr>
<?php $this->printExtendFields('', 'table', 'columns=1');?>
<?php $this->printExtendFields('', 'table');?>
<tr>
<th><?php echo $lang->testcase->files;?></th>
<td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>
module/testcase/view/edit.html.php
+2 -2
View File
@@ -114,7 +114,7 @@
</table>
</div>
</div>
<?php $this->printExtendFields($case, 'div', 'position=left&divCell=false');?>
<?php $this->printExtendFields($case, 'div', 'position=left');?>
<div class='detail'>
<div class='detail-title'><?php echo $lang->testcase->legendComment;?></div>
<div class='detail-content'><?php echo html::textarea('comment', '', "rows='5' class='form-control'");?></div>
@@ -248,7 +248,7 @@
<?php endif;?>
</table>
</div>
<?php $this->printExtendFields($case, 'div', 'position=right&divCell=false');?>
<?php $this->printExtendFields($case, 'div', 'position=right');?>
<div class='detail'>
<div class='detail-title'><?php echo $lang->testcase->legendOpenAndEdit;?></div>
<table class='table table-form'>
module/testcase/view/review.html.php
+1 -1
View File
@@ -36,7 +36,7 @@
<th><?php echo $lang->testcase->status;?></th>
<td><?php echo html::hidden('status', $case->status);?></td>
</tr>
<?php $this->printExtendFields($case, 'table', 'columns=1');?>
<?php $this->printExtendFields($case, 'table');?>
<tr>
<th><?php echo $lang->testcase->reviewedByAB;?></th>
<td colspan='2'><?php echo html::select('reviewedBy[]', $users, $app->user->account, "class='form-control chosen' multiple");?></td>
module/testcase/view/view.html.php
+2 -2
View File
@@ -96,7 +96,7 @@
</div>
<?php echo $this->fetch('file', 'printFiles', array('files' => $case->files, 'fieldset' => 'true'));?>
</div>
<?php $this->printExtendFields($case, 'div', "position=left&divCell=true");?>
<?php $this->printExtendFields($case, 'div', "position=left&inForm=0&inCell=1");?>
<div class='cell'><?php include '../../common/view/action.html.php';?></div>
<div class='main-actions'>
<div class="btn-toolbar">
@@ -327,7 +327,7 @@
</div>
</details>
</div>
<?php $this->printExtendFields($case, 'div', "position=right&divCell=true");?>
<?php $this->printExtendFields($case, 'div', "position=right&inForm=0&inCell=1");?>
</div>
</div>
<div id="mainActions" class='main-actions'>
module/testsuite/view/edit.html.php
+1 -1
View File
@@ -27,7 +27,7 @@
<th><?php echo $lang->testsuite->desc;?></th>
<td><?php echo html::textarea('desc', htmlspecialchars($suite->desc), "rows=10 class='form-control'");?></td>
</tr>
<?php $this->printExtendFields($suite, 'table', 'columns=1');?>
<?php $this->printExtendFields($suite, 'table');?>
<?php if($suite->type != 'library'):?>
<tr>
<th><?php echo $lang->testsuite->author;?></th>
module/testsuite/view/view.html.php
+1 -1
View File
@@ -153,7 +153,7 @@
</div>
</div>
</div>
<?php $this->printExtendFields($suite, 'div', "position=right&divCell=true");?>
<?php $this->printExtendFields($suite, 'div', "position=right&inForm=0&inCell=1");?>
<div class='cell'>
<?php include '../../common/view/action.html.php';?>
</div>
module/testtask/view/activate.html.php
+1 -1
View File
@@ -27,7 +27,7 @@
<th class='w-45px'><?php echo $lang->testtask->status;?></th>
<td><?php echo html::hidden('status', 'doing');?></td>
</tr>
<?php $this->printExtendFields($testtask, 'table', 'columns=1');?>
<?php $this->printExtendFields($testtask, 'table');?>
<tr>
<th class='w-45px'><?php echo $lang->comment;?></th>
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
module/testtask/view/block.html.php
+1 -1
View File
@@ -28,7 +28,7 @@
<th class='w-45px'><?php echo $lang->testtask->status;?></th>
<td><?php echo html::hidden('status', 'blocked');?></td>
</tr>
<?php $this->printExtendFields($testtask, 'table', 'columns=1');?>
<?php $this->printExtendFields($testtask, 'table');?>
<tr>
<th class='w-45px'><?php echo $lang->comment;?></th>
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
module/testtask/view/close.html.php
+1 -1
View File
@@ -27,7 +27,7 @@
<th class='w-60px'><?php echo $lang->testtask->status;?></th>
<td><?php echo html::hidden('status', 'done');?></td>
</tr>
<?php $this->printExtendFields($testtask, 'table', 'columns=1');?>
<?php $this->printExtendFields($testtask, 'table');?>
<tr>
<th class='w-60px'><?php echo $lang->comment;?></th>
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
module/testtask/view/create.html.php
+1 -1
View File
@@ -94,7 +94,7 @@
</div>
</td>
</tr>
<?php $this->printExtendFields('', 'table', 'columns=1');?>
<?php $this->printExtendFields('', 'table');?>
<tr>
<td class='text-center form-actions' colspan='3'>
<?php echo html::submitButton();?>
module/testtask/view/edit.html.php
+1 -1
View File
@@ -83,7 +83,7 @@
</div>
</td>
</tr>
<?php $this->printExtendFields($task, 'table', 'columns=1');?>
<?php $this->printExtendFields($task, 'table');?>
<tr>
<td class='text-center form-actions' colspan='3'>
<?php echo html::submitButton();?>
module/testtask/view/start.html.php
+1 -1
View File
@@ -29,7 +29,7 @@
<th class='w-45px'><?php echo $lang->testtask->status;?></th>
<td><?php echo html::hidden('status', 'doing');?></td>
</tr>
<?php $this->printExtendFields($testtask, 'table', 'columns=1');?>
<?php $this->printExtendFields($testtask, 'table');?>
<tr>
<th class='w-45px'><?php echo $lang->comment;?></th>
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
module/testtask/view/view.html.php
+2 -2
View File
@@ -41,7 +41,7 @@
<?php endif;?>
<?php $actionFormLink = $this->createLink('action', 'comment', "objectType=testtask&objectID=$task->id");?>
</div>
<?php $this->printExtendFields($task, 'div', "position=left&divCell=true");?>
<?php $this->printExtendFields($task, 'div', "position=left&inForm=0&inCell=1");?>
<div class='cell'><?php include '../../common/view/action.html.php';?></div>
<div class='main-actions'>
<div class="btn-toolbar">
@@ -124,7 +124,7 @@
</div>
</div>
</div>
<?php $this->printExtendFields($task, 'div', "position=right&mode=value");?>
<?php $this->printExtendFields($task, 'div', "position=right&inForm=0&inCell=1");?>
</div>
</div>
module/todo/model.php
+2 -2
View File
@@ -512,7 +512,7 @@ class todoModel extends model
if(strpos(",{$todo->config->week},", ",{$week},") !== false)
{
if(empty($lastCycle)) $date = $today;
if($lastCycle->date < $today) $date = $today;
if($lastCycle and $lastCycle->date < $today) $date = $today;
}
}
elseif($todo->config->type == 'month')
@@ -521,7 +521,7 @@ class todoModel extends model
if(strpos(",{$todo->config->month},", ",{$day},") !== false)
{
if(empty($lastCycle)) $date = $today;
if($lastCycle->date < $today) $date = $today;
if($lastCycle and $lastCycle->date < $today) $date = $today;
}
}
www/js/zui/min.js
+5 -5
View File
File diff suppressed because one or more lines are too long