diff --git a/module/bug/js/batchcreate.js b/module/bug/js/batchcreate.js index 2dda13c742..091963078f 100644 --- a/module/bug/js/batchcreate.js +++ b/module/bug/js/batchcreate.js @@ -10,6 +10,7 @@ $(function() hiddenRequireFields(); }); + /* Implement a custom form without feeling refresh. */ $('#formSettingForm .btn-primary').click(function() { var fields = ''; @@ -58,7 +59,6 @@ function checkedShowFields(fields) $('#formSettingForm > .checkboxes > .checkbox-primary > input').each(function() { var field = ',' + $(this).val() + ','; - var $field = $('#' + $(this).val()); var $field = $('[name^=' + $(this).val() + ']'); var required = ',' + requiredFields + ','; var $fieldBox = $('.' + $(this).val() + 'Box' ); diff --git a/module/common/view/customfield.html.php b/module/common/view/customfield.html.php index 4af7a48a4f..dc31cca74d 100644 --- a/module/common/view/customfield.html.php +++ b/module/common/view/customfield.html.php @@ -16,6 +16,8 @@ #formSettingForm .checkboxes {padding: 10px 3px;} #formSettingForm .checkbox-primary {width: 50%; float: left; margin: 3px 0;} #formSetting .btn {margin-right: 8px;} + [lang^='de'] #formSetting {min-width: 360px;} + [lang^='fr'] #formSetting {min-width: 320px;} rawModule; diff --git a/module/task/css/batchcreate.css b/module/task/css/batchcreate.css index 43d589faab..388bdf119c 100644 --- a/module/task/css/batchcreate.css +++ b/module/task/css/batchcreate.css @@ -11,6 +11,9 @@ select[id^="story"] + .picker-single {width: 130px; max-width: 130px;} .main-header .pull-left {max-width: 200px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} #zeroTaskStory {margin: 0 0 0 20px; height: 32px; padding: 5px 5px 5px 5px; border-radius: 3px; border: 2px solid transparent;} +[lang^='en'] #zeroTaskStory {max-width: 205px !important;} +[lang^='de'] #zeroTaskStory {max-width: 220px !important;} +[lang^='fr'] #zeroTaskStory {max-width: 265px !important;} #zeroTaskStory > label:before {top: 7px; left: 5px;} #zeroTaskStory > label:after {top: 7px; left: 5px;} #zeroTaskStory.checked {border-color: #00a9fc; background: #E9F2FB;} diff --git a/module/task/js/create.js b/module/task/js/create.js index d656899e8f..dd1edd9bfd 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -5,6 +5,7 @@ $(function() hiddenRequireFields(); }); + /* Implement a custom form without feeling refresh. */ $('#formSettingForm .btn-primary').click(function() { var fields = ''; diff --git a/module/testcase/js/common.js b/module/testcase/js/common.js index 3c27543f27..e15400f349 100644 --- a/module/testcase/js/common.js +++ b/module/testcase/js/common.js @@ -403,7 +403,7 @@ function loadStories(productID, moduleID, num) */ function setModules(branchID, productID, num) { - moduleLink = createLink('tree', 'ajaxGetModules', 'productID=' + productID + '&viewType=story&branch=' + branchID + '&num=' + num); + moduleLink = createLink('tree', 'ajaxGetModules', 'productID=' + productID + '&viewType=case&branch=' + branchID + '&num=' + num); $.get(moduleLink, function(modules) { if(!modules) modules = ''; @@ -426,46 +426,3 @@ function setModules(branchID, productID, num) $('#plan' + (num + 1)).trigger("chosen:updated"); } } - -/** - * Checked show fields. - * - * @param string fields - * @access public - * @return void - */ -function checkedShowFields(fields) -{ - var fieldList = ',' + fields + ','; - $('#formSettingForm > .checkboxes > .checkbox-primary > input').each(function() - { - var field = ',' + $(this).val() + ','; - var $fieldBox = $('.' + $(this).val() + 'Box' ); - if(fieldList.indexOf(field) >= 0) - { - - $(this).attr('checked', true); - $fieldBox.removeClass('hidden'); - } - else - { - if(!$fieldBox.hasClass('hidden')) $fieldBox.addClass('hidden'); - } - }); -} - -/** - * Disabled require field. - * - * @access public - * @return void - */ -function disabledRequireFields() -{ - $('#formSettingForm > .checkboxes > .checkbox-primary > input').each(function() - { - var field = ',' + $(this).val() + ','; - var required = ',' + requiredFields + ','; - if(required.indexOf(field) >= 0) $(this).attr('disabled', 'disabled'); - }); -} diff --git a/module/testcase/js/create.js b/module/testcase/js/create.js index 336e316691..5a525a8ba6 100644 --- a/module/testcase/js/create.js +++ b/module/testcase/js/create.js @@ -156,29 +156,4 @@ $(function() }); $('#subNavbar li[data-id="testcase"]').addClass('active'); - - $('#customField').click(function() - { - disabledRequireFields(); - }); - - $('#formSettingForm .btn-primary').click(function() - { - $('#formSettingForm > .checkboxes > .checkbox-primary > input').removeAttr('disabled'); - var fields = ''; - $('#formSettingForm > .checkboxes > .checkbox-primary > input:checked').each(function() - { - fields += ',' + $(this).val(); - }); - - var link = createLink('custom', 'ajaxSaveCustomFields', 'module=testcase§ion=custom&key=createFields'); - $.post(link, {'fields' : fields}, function() - { - checkedShowFields(fields); - disabledRequireFields(); - $('#formSetting').parent().removeClass('open'); - }); - - return false; - }); });