From dc022ad849d8fc7388a82d31d3762e207620fa50 Mon Sep 17 00:00:00 2001 From: liugang Date: Tue, 13 Aug 2019 14:58:15 +0800 Subject: [PATCH] * Optimize function to printExtendFields. --- framework/control.class.php | 15 ++++++++++----- module/bug/view/activate.html.php | 2 +- module/bug/view/assignto.html.php | 2 +- module/bug/view/close.html.php | 2 +- module/bug/view/confirmbug.html.php | 2 +- module/bug/view/create.html.php | 2 +- module/bug/view/edit.html.php | 4 ++-- module/bug/view/resolve.html.php | 2 +- module/bug/view/view.html.php | 4 ++-- module/build/view/view.html.php | 2 +- module/product/view/close.html.php | 2 +- module/product/view/create.html.php | 2 +- module/product/view/edit.html.php | 2 +- module/product/view/view.html.php | 4 ++-- module/productplan/view/edit.html.php | 2 +- module/productplan/view/view.html.php | 2 +- module/project/view/close.html.php | 2 +- module/project/view/create.html.php | 2 +- module/project/view/edit.html.php | 2 +- module/project/view/suspend.html.php | 2 +- module/project/view/view.html.php | 4 ++-- module/release/view/create.html.php | 2 +- module/release/view/edit.html.php | 2 +- module/release/view/view.html.php | 2 +- module/story/view/activate.html.php | 2 +- module/story/view/assignto.html.php | 2 +- module/story/view/change.html.php | 2 +- module/story/view/close.html.php | 2 +- module/story/view/create.html.php | 2 +- module/story/view/edit.html.php | 4 ++-- module/story/view/review.html.php | 2 +- module/story/view/view.html.php | 4 ++-- module/task/view/cancel.html.php | 2 +- module/task/view/close.html.php | 2 +- module/task/view/create.html.php | 2 +- module/task/view/edit.html.php | 5 ++--- module/task/view/pause.html.php | 2 +- module/task/view/view.html.php | 4 ++-- module/testcase/view/create.html.php | 2 +- module/testcase/view/edit.html.php | 4 ++-- module/testcase/view/review.html.php | 2 +- module/testcase/view/view.html.php | 4 ++-- module/testsuite/view/edit.html.php | 2 +- module/testsuite/view/view.html.php | 2 +- module/testtask/view/activate.html.php | 2 +- module/testtask/view/block.html.php | 2 +- module/testtask/view/close.html.php | 2 +- module/testtask/view/create.html.php | 2 +- module/testtask/view/edit.html.php | 2 +- module/testtask/view/start.html.php | 2 +- module/testtask/view/view.html.php | 4 ++-- 51 files changed, 71 insertions(+), 67 deletions(-) diff --git a/framework/control.class.php b/framework/control.class.php index b98973b91f..d7fd0ec2ee 100644 --- a/framework/control.class.php +++ b/framework/control.class.php @@ -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); } /** diff --git a/module/bug/view/activate.html.php b/module/bug/view/activate.html.php index d3af8dcb37..55f7eda56e 100644 --- a/module/bug/view/activate.html.php +++ b/module/bug/view/activate.html.php @@ -34,7 +34,7 @@ bug->status;?> - printExtendFields($bug, 'table', 'columns=1');?> + printExtendFields($bug, 'table');?> bug->openedBuild;?> openedBuild, 'size=4 multiple=multiple class="form-control chosen"');?> diff --git a/module/bug/view/assignto.html.php b/module/bug/view/assignto.html.php index 3953004a00..454c943aad 100644 --- a/module/bug/view/assignto.html.php +++ b/module/bug/view/assignto.html.php @@ -38,7 +38,7 @@ js::set('page', 'assignedto'); bug->status;?> status);?> - printExtendFields($bug, 'table', 'columns=1');?> + printExtendFields($bug, 'table');?> bug->mailto;?> mailto), 'class="form-control chosen" multiple');?> diff --git a/module/bug/view/close.html.php b/module/bug/view/close.html.php index 6ceb3f22a4..6d2f80c941 100644 --- a/module/bug/view/close.html.php +++ b/module/bug/view/close.html.php @@ -30,7 +30,7 @@ bug->status;?> - printExtendFields($bug, 'table', 'columns=1');?> + printExtendFields($bug, 'table');?> comment;?> diff --git a/module/bug/view/confirmbug.html.php b/module/bug/view/confirmbug.html.php index e9b31fca17..3d54a18561 100755 --- a/module/bug/view/confirmbug.html.php +++ b/module/bug/view/confirmbug.html.php @@ -50,7 +50,7 @@ js::set('page', 'confirmbug'); status);?> - printExtendFields($bug, 'table', 'columns=1');?> + printExtendFields($bug, 'table');?> bug->mailto;?> mailto), 'class="form-control chosen" multiple');?> diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index 1ab8b9d20e..5d8ec4dc24 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -292,7 +292,7 @@ js::set('flow', $config->global->flow); bug->status;?> - printExtendFields('', 'table', 'columns=1');?> + printExtendFields('', 'table');?> bug->files;?> fetch('file', 'buildform', 'fileCount=1&percent=0.85');?> diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index 93e71d744d..a762c9b334 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -62,7 +62,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild); - printExtendFields($bug, 'div', 'position=left&divCell=false');?> + printExtendFields($bug, 'div', 'position=left');?>
files;?>
fetch('file', 'buildform');?>
@@ -297,7 +297,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
- printExtendFields($bug, 'div', 'position=right&divCell=false');?> + printExtendFields($bug, 'div', 'position=right');?> diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php index f2c2523579..d7a7b9f6d1 100644 --- a/module/bug/view/resolve.html.php +++ b/module/bug/view/resolve.html.php @@ -77,7 +77,7 @@ js::set('productID' , $bug->product); bug->status;?> - printExtendFields($bug, 'table', 'columns=1');?> + printExtendFields($bug, 'table');?> bug->files;?> fetch('file', 'buildform', 'fileCount=1&percent=0.85');?> diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index 1794eefb73..4cc4131aca 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -58,7 +58,7 @@ fetch('file', 'printFiles', array('files' => $bug->files, 'fieldset' => 'true'));?> createLink('action', 'comment', "objectType=bug&objectID=$bug->id");?> - printExtendFields($bug, 'div', "position=left&divCell=true");?> + printExtendFields($bug, 'div', "position=left&inForm=0&inCell=1");?>
id"; @@ -376,7 +376,7 @@ - printExtendFields($bug, 'div', "position=right&mode=value");?> + printExtendFields($bug, 'div', "position=right&inForm=0&inCell=1");?> diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index f968eadafd..94be631064 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -335,7 +335,7 @@ tbody tr td:first-child input{display:none;} build->filePath;?> filePath, $build->filePath, '_blank');?> - printExtendFields($build, 'table', "position=all&columns=1");?> + printExtendFields($build, 'table', 'inForm=0');?> global->flow != 'onlyTest'):?> build->desc;?> diff --git a/module/product/view/close.html.php b/module/product/view/close.html.php index b4e12dbe32..e6ec6e5039 100644 --- a/module/product/view/close.html.php +++ b/module/product/view/close.html.php @@ -28,7 +28,7 @@ product->status;?> status);?> - printExtendFields($product, 'table', 'columns=1');?> + printExtendFields($product, 'table');?> comment;?> diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php index b089804aec..62cfba66a0 100644 --- a/module/product/view/create.html.php +++ b/module/product/view/create.html.php @@ -66,7 +66,7 @@ - printExtendFields('', 'table', 'columns=1');?> + printExtendFields('', 'table');?> product->desc;?> diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php index 572d8b9935..c01aae8c75 100644 --- a/module/product/view/edit.html.php +++ b/module/product/view/edit.html.php @@ -58,7 +58,7 @@ product->status;?> product->statusList, $product->status, "class='form-control'");?> - printExtendFields($product, 'table', 'columns=1');?> + printExtendFields($product, 'table');?> product->desc;?> desc), "rows='8' class='form-control'");?> diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php index 7f3dba8890..319ec4d2aa 100644 --- a/module/product/view/view.html.php +++ b/module/product/view/view.html.php @@ -75,7 +75,7 @@ - printExtendFields($product, 'div', "position=left&divCell=false");?> + printExtendFields($product, 'div', "position=left&inForm=0");?>
createLink('action', 'comment', "objectType=product&objectID=$product->id");?> @@ -236,7 +236,7 @@
- printExtendFields($product, 'div', "position=right&mode=value");?> + printExtendFields($product, 'div', "position=right&inForm=0&inCell=1");?> diff --git a/module/productplan/view/edit.html.php b/module/productplan/view/edit.html.php index 3a22833ff6..7f408d399b 100644 --- a/module/productplan/view/edit.html.php +++ b/module/productplan/view/edit.html.php @@ -52,7 +52,7 @@ end != '2030-01-01' ? formatTime($plan->end) : '', 'class="form-control form-date"');?> productplan->endList , '', "onclick='computeEndDate(this.value)'");?> - printExtendFields($plan, 'table', 'columns=1');?> + printExtendFields($plan, 'table');?> productplan->desc;?> desc), "rows='10' class='form-control kindeditor' hidefocus='true'");?> diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index 8bc2effef1..e6e996e2a6 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -455,7 +455,7 @@ - printExtendFields($plan, 'table', "position=all&columns=1");?> + printExtendFields($plan, 'table', 'inForm=0');?> productplan->desc;?> desc;?> diff --git a/module/project/view/close.html.php b/module/project/view/close.html.php index 984bd88366..7ef24518a1 100644 --- a/module/project/view/close.html.php +++ b/module/project/view/close.html.php @@ -29,7 +29,7 @@ project->status;?> - printExtendFields($project, 'table', 'columns=1');?> + printExtendFields($project, 'table');?> comment;?> diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 0eea960508..fa4d4959d7 100644 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -88,7 +88,7 @@ - printExtendFields('', 'table', 'columns=1');?> + printExtendFields('', 'table');?> global->flow == 'onlyTask') echo "class='hidden'";?>> project->manageProducts;?> diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php index feaa6acb5b..6f89eba8ba 100644 --- a/module/project/view/edit.html.php +++ b/module/project/view/edit.html.php @@ -150,7 +150,7 @@ project->desc;?> desc), "rows='6' class='form-control kindeditor' hidefocus='true'");?> - printExtendFields($project, 'table', 'columns=1');?> + printExtendFields($project, 'table');?> project->acl;?> project->aclList, $project->acl, "onclick='setWhite(this.value);'", 'block'));?> diff --git a/module/project/view/suspend.html.php b/module/project/view/suspend.html.php index 89ef1020c8..13a6ab7401 100644 --- a/module/project/view/suspend.html.php +++ b/module/project/view/suspend.html.php @@ -28,7 +28,7 @@ project->status;?> - printExtendFields($project, 'table', 'columns=1');?> + printExtendFields($project, 'table');?> comment;?> diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index d61c02ba17..44e0b3f98a 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -140,7 +140,7 @@ - printExtendFields($project, 'div', "position=left&divCell=false");?> + printExtendFields($project, 'div', "position=left&inForm=0");?>
createLink('action', 'comment', "objectType=project&objectID=$project->id");?> @@ -295,7 +295,7 @@
- printExtendFields($project, 'div', "position=right&mode=value");?> + printExtendFields($project, 'div', "position=right&inForm=0&inCell=1");?> diff --git a/module/release/view/create.html.php b/module/release/view/create.html.php index 115262cf60..2c134b8375 100644 --- a/module/release/view/create.html.php +++ b/module/release/view/create.html.php @@ -44,7 +44,7 @@ - printExtendFields('', 'table', 'columns=1');?> + printExtendFields('', 'table');?> release->desc;?> diff --git a/module/release/view/edit.html.php b/module/release/view/edit.html.php index d35affc5ed..bf94003bc4 100644 --- a/module/release/view/edit.html.php +++ b/module/release/view/edit.html.php @@ -47,7 +47,7 @@ release->status;?> release->statusList, $release->status, "class='form-control'");?> - printExtendFields($release, 'table', 'columns=1');?> + printExtendFields($release, 'table');?> release->desc;?> desc), "rows=10 class='form-control kindeditor' hidefocus='true'");?> diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index 0b295c42c9..dc10c7be81 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -330,7 +330,7 @@ release->date;?> date;?> - printExtendFields($release, 'table', "position=all&columns=1");?> + printExtendFields($release, 'table', 'inForm=0');?> release->desc;?> desc;?> diff --git a/module/story/view/activate.html.php b/module/story/view/activate.html.php index aacb0bb91d..c946a90973 100644 --- a/module/story/view/activate.html.php +++ b/module/story/view/activate.html.php @@ -38,7 +38,7 @@ ?> - printExtendFields($story, 'table', 'columns=1');?> + printExtendFields($story, 'table');?> story->comment;?> diff --git a/module/story/view/assignto.html.php b/module/story/view/assignto.html.php index ba8cc09ff1..a523af0712 100644 --- a/module/story/view/assignto.html.php +++ b/module/story/view/assignto.html.php @@ -33,7 +33,7 @@ story->status;?> status);?> - printExtendFields($story, 'table', 'columns=1');?> + printExtendFields($story, 'table');?> comment;?> diff --git a/module/story/view/change.html.php b/module/story/view/change.html.php index a828a4d006..43c0000a9b 100644 --- a/module/story/view/change.html.php +++ b/module/story/view/change.html.php @@ -40,7 +40,7 @@ story->status;?> status);?> - printExtendFields($story, 'table', 'columns=1');?> + printExtendFields($story, 'table');?> story->title;?> title, 'class="form-control"');?> diff --git a/module/story/view/close.html.php b/module/story/view/close.html.php index 872d185444..31a27df0f9 100644 --- a/module/story/view/close.html.php +++ b/module/story/view/close.html.php @@ -40,7 +40,7 @@ story->status;?> - printExtendFields($story, 'table', 'columns=1');?> + printExtendFields($story, 'table');?> story->comment;?> diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index a630dbaf74..b217129d2b 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -177,7 +177,7 @@ story->status;?> - printExtendFields('', 'table', 'columns=1');?> + printExtendFields('', 'table');?> story->legendAttatch;?> fetch('file', 'buildform');?> diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php index 7b29c31993..0a1970af89 100644 --- a/module/story/view/edit.html.php +++ b/module/story/view/edit.html.php @@ -43,7 +43,7 @@
story->verify;?>
verify;?>
- printExtendFields($story, 'div', 'position=left&divCell=false');?> + printExtendFields($story, 'div', 'position=left');?>
story->comment;?>
@@ -200,7 +200,7 @@
- printExtendFields($story, 'div', 'position=right&divCell=false');?> + printExtendFields($story, 'div', 'position=right');?>
story->legendMisc;?>
diff --git a/module/story/view/review.html.php b/module/story/view/review.html.php index fa3703d339..197d5f1fb8 100644 --- a/module/story/view/review.html.php +++ b/module/story/view/review.html.php @@ -68,7 +68,7 @@ var assignedTo = 'lastEditedBy ? print($story->lastEditedBy) : pri story->status;?> status);?> - printExtendFields($story, 'table', 'columns=1');?> + printExtendFields($story, 'table');?> story->reviewedBy;?> user->account, "class='form-control' multiple data-placeholder='{$lang->story->chosen->reviewedBy}'");?> diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index eb9982657b..d713176357 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -62,7 +62,7 @@ fetch('file', 'printFiles', array('files' => $story->files, 'fieldset' => 'true'));?> createLink('action', 'comment', "objectType=story&objectID=$story->id");?>
- printExtendFields($story, 'div', "position=left&divCell=true");?> + printExtendFields($story, 'div', "position=left&inForm=0&inCell=1");?>
@@ -387,7 +387,7 @@
- printExtendFields($story, 'div', "position=right&mode=value");?> + printExtendFields($story, 'div', "position=right&inForm=0&inCell=1");?> diff --git a/module/task/view/cancel.html.php b/module/task/view/cancel.html.php index d13a720294..ad9ea44b5a 100644 --- a/module/task/view/cancel.html.php +++ b/module/task/view/cancel.html.php @@ -30,7 +30,7 @@ task->status;?> - printExtendFields($task, 'table', 'columns=1');?> + printExtendFields($task, 'table');?> comment;?> diff --git a/module/task/view/close.html.php b/module/task/view/close.html.php index 8031ccfa13..7002c5007c 100644 --- a/module/task/view/close.html.php +++ b/module/task/view/close.html.php @@ -30,7 +30,7 @@ task->status;?> - printExtendFields($task, 'table', 'columns=1');?> + printExtendFields($task, 'table');?> comment;?> diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index fda31fb51f..483083576b 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -63,7 +63,7 @@ task->status;?> - printExtendFields('', 'table', 'columns=1');?> + printExtendFields('', 'table');?> global->flow != 'onlyTask' and $project->type != 'ops'):?> task->story;?> diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index d3d786e9d2..dddada366d 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -69,7 +69,7 @@
comment;?>
- printExtendFields($task, 'div', 'position=left&divCell=false');?> + printExtendFields($task, 'div', 'position=left');?>
files;?>
fetch('file', 'buildform');?>
@@ -215,7 +215,7 @@
- printExtendFields($task, 'div', 'position=right&divCell=false');?> + printExtendFields($task, 'div', 'position=right');?> @@ -274,7 +274,6 @@ - printExtendFields($task, 'div', 'position=left&divCell=false');?> diff --git a/module/task/view/pause.html.php b/module/task/view/pause.html.php index 6f1af85d72..e580f43c86 100644 --- a/module/task/view/pause.html.php +++ b/module/task/view/pause.html.php @@ -38,7 +38,7 @@ task->status;?> - printExtendFields($task, 'table', 'columns=1');?> + printExtendFields($task, 'table');?> comment;?> diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index 7c2ad104c9..3dc8f82f5d 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -145,7 +145,7 @@ fetch('file', 'printFiles', array('files' => $task->files, 'fieldset' => 'true'));?> createLink('action', 'comment', "objectType=task&objectID=$task->id");?> - printExtendFields($task, 'div', "position=left&divCell=true");?> + printExtendFields($task, 'div', "position=left&inForm=0&inCell=1");?>
@@ -376,7 +376,7 @@
- printExtendFields($task, 'div', "position=right&mode=value");?> + printExtendFields($task, 'div', "position=right&inForm=0&inCell=1");?> diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php index fd99d6d02d..1971328be4 100644 --- a/module/testcase/view/create.html.php +++ b/module/testcase/view/create.html.php @@ -210,7 +210,7 @@ testcase->status;?> - printExtendFields('', 'table', 'columns=1');?> + printExtendFields('', 'table');?> testcase->files;?> fetch('file', 'buildform');?> diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php index f43d592c4a..943f2db84e 100644 --- a/module/testcase/view/edit.html.php +++ b/module/testcase/view/edit.html.php @@ -114,7 +114,7 @@ - printExtendFields($case, 'div', 'position=left&divCell=false');?> + printExtendFields($case, 'div', 'position=left');?>
testcase->legendComment;?>
@@ -248,7 +248,7 @@
- printExtendFields($case, 'div', 'position=right&divCell=false');?> + printExtendFields($case, 'div', 'position=right');?>
testcase->legendOpenAndEdit;?>
diff --git a/module/testcase/view/review.html.php b/module/testcase/view/review.html.php index 2f037d5cb1..5fe8d599a7 100644 --- a/module/testcase/view/review.html.php +++ b/module/testcase/view/review.html.php @@ -36,7 +36,7 @@ - printExtendFields($case, 'table', 'columns=1');?> + printExtendFields($case, 'table');?> diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index d74247c4cb..1b110cbcb9 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -96,7 +96,7 @@ fetch('file', 'printFiles', array('files' => $case->files, 'fieldset' => 'true'));?> - printExtendFields($case, 'div', "position=left&divCell=true");?> + printExtendFields($case, 'div', "position=left&inForm=0&inCell=1");?>
@@ -327,7 +327,7 @@
- printExtendFields($case, 'div', "position=right&divCell=true");?> + printExtendFields($case, 'div', "position=right&inForm=0&inCell=1");?>
diff --git a/module/testsuite/view/edit.html.php b/module/testsuite/view/edit.html.php index b6688bd2c6..807ea8c7c5 100644 --- a/module/testsuite/view/edit.html.php +++ b/module/testsuite/view/edit.html.php @@ -27,7 +27,7 @@
- printExtendFields($suite, 'table', 'columns=1');?> + printExtendFields($suite, 'table');?> type != 'library'):?> diff --git a/module/testsuite/view/view.html.php b/module/testsuite/view/view.html.php index 7b150a4e8f..ee6da9488a 100644 --- a/module/testsuite/view/view.html.php +++ b/module/testsuite/view/view.html.php @@ -153,7 +153,7 @@ - printExtendFields($suite, 'div', "position=right&divCell=true");?> + printExtendFields($suite, 'div', "position=right&inForm=0&inCell=1");?>
diff --git a/module/testtask/view/activate.html.php b/module/testtask/view/activate.html.php index 958cb7c25a..68f38ff3cf 100644 --- a/module/testtask/view/activate.html.php +++ b/module/testtask/view/activate.html.php @@ -27,7 +27,7 @@ - printExtendFields($testtask, 'table', 'columns=1');?> + printExtendFields($testtask, 'table');?> diff --git a/module/testtask/view/block.html.php b/module/testtask/view/block.html.php index 05301610cf..9d8d88385b 100644 --- a/module/testtask/view/block.html.php +++ b/module/testtask/view/block.html.php @@ -28,7 +28,7 @@ - printExtendFields($testtask, 'table', 'columns=1');?> + printExtendFields($testtask, 'table');?> diff --git a/module/testtask/view/close.html.php b/module/testtask/view/close.html.php index aa42a83333..c789730286 100644 --- a/module/testtask/view/close.html.php +++ b/module/testtask/view/close.html.php @@ -27,7 +27,7 @@ - printExtendFields($testtask, 'table', 'columns=1');?> + printExtendFields($testtask, 'table');?> diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php index a82c0ede2d..5fa2bc65ac 100644 --- a/module/testtask/view/create.html.php +++ b/module/testtask/view/create.html.php @@ -94,7 +94,7 @@ - printExtendFields('', 'table', 'columns=1');?> + printExtendFields('', 'table');?> - printExtendFields($task, 'table', 'columns=1');?> + printExtendFields($task, 'table');?> - printExtendFields($testtask, 'table', 'columns=1');?> + printExtendFields($testtask, 'table');?> diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php index ab463683da..1bec08eeec 100644 --- a/module/testtask/view/view.html.php +++ b/module/testtask/view/view.html.php @@ -41,7 +41,7 @@ createLink('action', 'comment', "objectType=testtask&objectID=$task->id");?> - printExtendFields($task, 'div', "position=left&divCell=true");?> + printExtendFields($task, 'div', "position=left&inForm=0&inCell=1");?>
@@ -124,7 +124,7 @@
- printExtendFields($task, 'div', "position=right&mode=value");?> + printExtendFields($task, 'div', "position=right&inForm=0&inCell=1");?>
testcase->status;?> status);?>
testcase->reviewedByAB;?> user->account, "class='form-control chosen' multiple");?> testsuite->desc;?> desc), "rows=10 class='form-control'");?>
testsuite->author;?> testtask->status;?>
comment;?> testtask->status;?>
comment;?> testtask->status;?>
comment;?>
diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php index d920c5bc30..c93241f3fd 100644 --- a/module/testtask/view/edit.html.php +++ b/module/testtask/view/edit.html.php @@ -83,7 +83,7 @@
diff --git a/module/testtask/view/start.html.php b/module/testtask/view/start.html.php index f43b5dc55f..fe9cf19be8 100644 --- a/module/testtask/view/start.html.php +++ b/module/testtask/view/start.html.php @@ -29,7 +29,7 @@ testtask->status;?>
comment;?>