diff --git a/module/project/model.php b/module/project/model.php index be94a033cf..060ea5eed2 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -2082,7 +2082,7 @@ class projectModel extends model $taskSum ++; } - return sprintf($this->lang->project->taskSummary, $taskSum, $statusWait, $statusDoing, $totalEstimate, round($totalConsumed, 1), $totalLeft); + return sprintf($this->lang->project->taskSummary, $taskSum, $statusWait, $statusDoing, $totalEstimate, round($totalConsumed, 1), round($totalLeft, 1)); } /** diff --git a/module/testcase/css/common.css b/module/testcase/css/common.css index f9c1202d48..5489665fe9 100644 --- a/module/testcase/css/common.css +++ b/module/testcase/css/common.css @@ -22,6 +22,7 @@ #steps.sortable-sorting > tr.drag-row > td {background-color: #edf3fe!important} #steps.sortable > tr.drop-success > td {background-color: #cfe0ff; transition: background-color 2s;} #steps .step-type-toggle {padding: 5px 11px 5px 7px;} +#steps .step textarea.autosize{resize:none;} .table-bordered .step-actions {width: 105px;} .table-bordered > #steps > tr > td {padding: 0; background-color: #fafafa; border: 1px solid #ddd!important; border-left-style: dotted!important; border-right-style: dotted!important;} diff --git a/module/testcase/js/common.js b/module/testcase/js/common.js index a924dcda0e..6c46c42037 100644 --- a/module/testcase/js/common.js +++ b/module/testcase/js/common.js @@ -143,14 +143,17 @@ function setStories() */ function initSteps(selector) { - if(navigator.userAgent.indexOf("Firefox") < 0) + $(document).on('input keyup paste change', 'textarea.autosize', function() { - $(document).on('input keyup paste change', 'textarea.autosize', function() + var height = (this.scrollHeight + 2) + "px"; + this.style.height = 'auto'; + this.style.height = height; + $(this).closest('tr').find('textarea').each(function() { - this.style.height = 'auto'; - this.style.height = (this.scrollHeight + 2) + "px"; + this.style.height = height; }); - } + }); + var $steps = $(selector || '#steps'); var $stepTemplate = $('#stepTemplate').detach().removeClass('template').attr('id', null); var initSortableCallTask = null; diff --git a/module/user/model.php b/module/user/model.php index 12db84f1f6..f6a209ccc2 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -234,6 +234,7 @@ class userModel extends model ->batchCheck($this->config->user->create->requiredFields, 'notempty') ->check('account', 'unique') ->check('account', 'account') + ->checkIF($this->post->email != '', 'email', 'email') ->exec(); if($this->post->group) {