diff --git a/module/caselib/css/createcase.css b/module/caselib/css/createcase.css index 7f2f67a335..8c0745564a 100644 --- a/module/caselib/css/createcase.css +++ b/module/caselib/css/createcase.css @@ -46,6 +46,8 @@ .minw-80px {min-width: 80px;} .title-group.required:after {display: none;} .title-group.required > .required:after {display: block; right: 29px; top: 5px;} +#titleBox.required:after{display: block; right: 29px; top: 5px;} +#priRequiredBox.required:after{display: block; right: -12px; top: 5px;} .pri-selector > .btn {padding: 5px 8px !important; width: 100%;} .pri-selector > .dropdown-menu {padding: 10px;} diff --git a/module/caselib/view/batchcreatecase.html.php b/module/caselib/view/batchcreatecase.html.php index d1d8a5cbb8..7faf3c535d 100644 --- a/module/caselib/view/batchcreatecase.html.php +++ b/module/caselib/view/batchcreatecase.html.php @@ -25,13 +25,13 @@ idAB;?> - '>testcase->module;?> + '>testcase->module;?> testcase->title;?> testcase->type;?> - testcase->pri;?> - testcase->precondition;?> - testcase->keywords;?> - testcase->stage;?> + '>testcase->pri;?> + '>testcase->precondition;?> + '>testcase->keywords;?> + '>testcase->stage;?> diff --git a/module/caselib/view/createcase.html.php b/module/caselib/view/createcase.html.php index 1dcaed2fc1..057e22f41b 100644 --- a/module/caselib/view/createcase.html.php +++ b/module/caselib/view/createcase.html.php @@ -33,7 +33,7 @@ - testcase->create->requiredFields, 'module') ? ' class="required"' : '';?>> + testcase->create->requiredFields, 'module') !== false ? ' class="required"' : '';?>>
testcase->module?> testcase->type;?> testcase->typeList, $type, "class='form-control chosen'");?> - + testcase->create->requiredFields, 'stage') !== false ? ' class="required"' : '';?>>
testcase->stage?> testcase->stageList, $stage, "class='form-control chosen' multiple='multiple'");?> @@ -67,7 +67,7 @@ testcase->title;?>
-
+
@@ -101,7 +101,8 @@ -
+ testcase->create->requiredFields, 'pri') !== false ? True : False;?> +
class="input-group-btn pri-selector " data-type="pri"> @@ -116,7 +117,7 @@ testcase->precondition;?> - + testcase->create->requiredFields, 'precondition') !== false ? ' class="required"' : '';?>> testcase->steps;?> @@ -189,7 +190,7 @@ testcase->keywords;?> - + testcase->create->requiredFields, 'keywords') !== false ? ' class="required"' : '';?>> diff --git a/module/testcase/css/create.css b/module/testcase/css/create.css index 40e076887a..8dd356cd5c 100644 --- a/module/testcase/css/create.css +++ b/module/testcase/css/create.css @@ -39,6 +39,8 @@ .title-group.required:after {display: none;} .title-group.required > .required:after {display: block; right: 29px; top: 5px;} +#titleBox.required:after{display: block; right: 29px; top: 5px;} +#priRequiredBox.required:after{display: block; right: -12px; top: 5px;} .pri-selector > .btn {padding: 5px 8px !important; width: 100%;} .pri-selector > .dropdown-menu {padding: 10px;} .stageBox {padding-left: 15px !important;} diff --git a/module/testcase/js/create.js b/module/testcase/js/create.js index d10755f5a4..4042988341 100644 --- a/module/testcase/js/create.js +++ b/module/testcase/js/create.js @@ -36,11 +36,17 @@ $(function() $searchInput.focus(); }); }; + $(document).on('change', '#story', function() { if($(this).val() === 'showmore') showSearchModal(); }); + $(document).on('click', '#priRequiredBox', function() + { + $('#priSelect').removeClass('required'); + }); + $(document).on('click', '#story_chosen .chosen-results > li.no-results', showSearchModal); $searchStories.on('hide.zui.modal', function() diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php index 64177d11d2..0ecf6a9828 100644 --- a/module/testcase/view/create.html.php +++ b/module/testcase/view/create.html.php @@ -111,7 +111,7 @@ foreach(explode(',', $config->testcase->create->requiredFields) as $field) testcase->title;?>
-
+
@@ -145,11 +145,12 @@ foreach(explode(',', $config->testcase->create->requiredFields) as $field) -
- -