diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index f4abbb41bb..0b900bc124 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1290,7 +1290,7 @@ $lang->resource->mr->unlink = 'unlink'; $lang->resource->mr->approval = 'approval'; $lang->resource->mr->close = 'close'; $lang->resource->mr->reopen = 'reopen'; -$lang->resource->mr->addBug = 'addBug'; +$lang->resource->mr->addReview = 'addReview'; $lang->mr->methodOrder[10] = 'create'; $lang->mr->methodOrder[15] = 'browse'; @@ -1307,7 +1307,7 @@ $lang->mr->methodOrder[75] = 'unlink'; $lang->mr->methodOrder[80] = 'approval'; $lang->mr->methodOrder[85] = 'close'; $lang->mr->methodOrder[90] = 'reopen'; -$lang->mr->methodOrder[95] = 'addBug'; +$lang->mr->methodOrder[95] = 'addReview'; /* Git. */ $lang->resource->git = new stdclass(); diff --git a/module/mr/js/diff.js b/module/mr/js/diff.js index b0ab2c451a..fba408bb13 100644 --- a/module/mr/js/diff.js +++ b/module/mr/js/diff.js @@ -5,6 +5,13 @@ $(document).ready(function() $(".label-exchange").click(function(){ $('#exchange').submit();}); }); +/** + * Change encoding. + * + * @param string $encoding + * @access public + * @return void + */ function changeEncoding(encoding) { $('#encoding').val(encoding); @@ -14,11 +21,8 @@ function changeEncoding(encoding) $(document).ready(function() { var $diffCode = $('.diff'); - var hidePreview; - var $reviewsPreview = $('#reviewsPreview'); - var $reviewsPreviewMenu = $('#reviewsPreview').children('.dropdown-menu'); - var $rows = $diffCode.find('tr'); - var rowTip = $('#rowTip').html(); + var $rows = $diffCode.find('tr'); + var rowTip = $('#rowTip').html(); var lastLine; $rows.each(function() { @@ -48,10 +52,10 @@ $(document).ready(function() $(this).removeClass("over"); }); - var isInline = $.cookie('arrange') == 'inline'; + var isInline = $.cookie('arrange') == 'inline'; var $reviewFormRow = $('' + (isInline ? '' : '') + ''); - var $reviewForm = $('#reviewForm'); - var $reviewPanel = $('#reviewPanel'); + var $reviewForm = $('#reviewForm'); + var $reviewPanel = $('#reviewPanel'); $reviewFormRow.find('td').append($reviewForm.removeClass('hide')); var highlight = function($e) @@ -62,7 +66,6 @@ $(document).ready(function() var createReview = function(review, line, show) { - var commentCount, j; var $review = $reviewPanel.clone().removeClass('hide').attr('id', review.objectType + '-' + review.id); $review.find('.realname').text(review.realname); $review.find('.openedDate').text(review.openedDate); @@ -174,7 +177,7 @@ $(document).ready(function() if(confirm(confirmDelete)) { - var link = createLink($review.data('objectType'), 'delete', 'id=' + $review.data('id') + '&confirm=yes'); + var link = createLink($review.data('objectType'), 'delete', 'id=' + $review.data('id') + '&confirm=yes'); $.get(link, function(data) { var $commentRow = $review.closest('.comment-row'); @@ -283,30 +286,30 @@ $(document).ready(function() $('.highlight').removeClass('highlight'); }); + /** + * Anchor + * + * @access public + * @return void + */ function anchor() { - var hash = window.location.hash; - if(hash) + var hash = window.location.hash; + if(!hash) return false; + + var line = hash.substr(1).replace('L', ''); + var $row = $('.diff tr[data-line="' + line +'"]').first(); + if($row.length) return false; + + var anchor = $row.offset().top; + $('body,html').animate({scrollTop:anchor - 50}, 500); + + $row.addClass('highlight'); + if($row.hasClass('commented')) { - var line = hash.substr(1).replace('L', ''); - var $row = $('.diff tr[data-line="' + line +'"]').first(); - if($row.length) - { - var anchor = $row.offset().top; - - $('body,html').animate({scrollTop:anchor - 50}, 500); - - $row.addClass('highlight'); - if($row.hasClass('commented')) - { - toggleComment($row, true); - var $commentRow = $row.next('tr'); - if($commentRow.hasClass('comment-row')) - { - $commentRow.addClass('highlight'); - } - } - } + toggleComment($row, true); + var $commentRow = $row.next('tr'); + if($commentRow.hasClass('comment-row')) $commentRow.addClass('highlight'); } } }); diff --git a/module/mr/lang/en.php b/module/mr/lang/en.php index 102d6f192c..b8016139ec 100644 --- a/module/mr/lang/en.php +++ b/module/mr/lang/en.php @@ -21,11 +21,11 @@ $lang->mr->linkStory = 'Link Stories'; $lang->mr->linkBug = 'Link Bugs'; $lang->mr->linkTask = 'Link Tasks'; $lang->mr->unlink = 'UnLink of stories,Bugs,tasks'; -$lang->mr->addBug = 'Add Review'; +$lang->mr->addReview = 'Add Review'; $lang->mr->id = 'ID'; $lang->mr->mriid = "raw MR ID"; -$lang->mr->title = 'Name'; +$lang->mr->title = 'Name'; $lang->mr->status = 'Status'; $lang->mr->author = 'Author'; $lang->mr->assignee = 'Assignee'; @@ -46,7 +46,12 @@ $lang->mr->reject = 'Reject'; $lang->mr->close = 'Close'; $lang->mr->reopen = 'Reopen'; -$lang->mr->approvalResult = 'Approval result'; +$lang->mr->reviewType = 'Review Type'; +$lang->mr->reviewTypeList = array(); +$lang->mr->reviewTypeList['bug'] = 'Bug'; +$lang->mr->reviewTypeList['task'] = 'Task'; + +$lang->mr->approvalResult = 'Approval result'; $lang->mr->approvalResultList = array(); $lang->mr->approvalResultList['approve'] = 'Approve'; $lang->mr->approvalResultList['reject'] = 'Reject'; diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php index c5c87e9a91..0cf6efa7c8 100644 --- a/module/mr/lang/zh-cn.php +++ b/module/mr/lang/zh-cn.php @@ -46,12 +46,12 @@ $lang->mr->reject = '拒绝'; $lang->mr->close = '关闭'; $lang->mr->reopen = '重新打开'; -$lang->mr->reviewType = '评审类型'; +$lang->mr->reviewType = '评审类型'; $lang->mr->reviewTypeList = array(); $lang->mr->reviewTypeList['bug'] = 'Bug'; $lang->mr->reviewTypeList['task'] = '任务'; -$lang->mr->approvalResult = '评审意见'; +$lang->mr->approvalResult = '评审意见'; $lang->mr->approvalResultList = array(); $lang->mr->approvalResultList['approve'] = '通过'; $lang->mr->approvalResultList['reject'] = '拒绝'; diff --git a/module/mr/model.php b/module/mr/model.php index e1d8b4efcc..199d5aa584 100644 --- a/module/mr/model.php +++ b/module/mr/model.php @@ -906,7 +906,7 @@ class mrModel extends model ->remove('begin,end,uid,reviewType,taskExecution,taskModule,taskAssignedTo') ->get(); - $data->steps = $this->loadModel('file')->pasteImage($data->commentText, $this->post->uid); + $data->steps = $this->loadModel('file')->pasteImage($data->commentText, $this->post->uid); if($data->assignedTo) $data->assignedDate = $now; unset($data->commentText); diff --git a/module/mr/view/header.review.html.php b/module/mr/view/header.review.html.php index 6371bca0e7..5cf64cc281 100644 --- a/module/mr/view/header.review.html.php +++ b/module/mr/view/header.review.html.php @@ -61,19 +61,19 @@ foreach($reviews as $line => $lineReview) { foreach($objects as $objectID => $object) { - $lineReview = array(); - $lineReview['id'] = $objectID; - $lineReview['line'] = $line; - $lineReview['title'] = $objectType == 'bug' ? $object->title : $object->name; - $lineReview['content'] = $objectType == 'bug' ? $object->steps : $object->desc; - $lineReview['realname'] = $object->realname; - $lineReview['openedDate'] = substr($object->openedDate, 5, 11); - $lineReview['lines'] = $object->lines; - $lineReview['objectType'] = $objectType; - $lineReview['entry'] = $object->entry; - $lineReview['edit'] = common::hasPriv($objectType, 'edit'); - $lineReview['delete'] = common::hasPriv($objectType, 'delete'); - $lineReview['view'] = common::hasPriv($objectType, 'view'); + $lineReview = array(); + $lineReview['id'] = $objectID; + $lineReview['line'] = $line; + $lineReview['title'] = $objectType == 'bug' ? $object->title : $object->name; + $lineReview['content'] = $objectType == 'bug' ? $object->steps : $object->desc; + $lineReview['realname'] = $object->realname; + $lineReview['openedDate'] = substr($object->openedDate, 5, 11); + $lineReview['lines'] = $object->lines; + $lineReview['objectType'] = $objectType; + $lineReview['entry'] = $object->entry; + $lineReview['edit'] = common::hasPriv($objectType, 'edit'); + $lineReview['delete'] = common::hasPriv($objectType, 'delete'); + $lineReview['view'] = common::hasPriv($objectType, 'view'); $lineReviews[$line][] = $lineReview; } } diff --git a/module/repo/lang/en.php b/module/repo/lang/en.php index a908cc5891..e5fa02bbc2 100644 --- a/module/repo/lang/en.php +++ b/module/repo/lang/en.php @@ -146,6 +146,7 @@ $lang->repo->notice->syncedCount = 'The number of records synchronized is '; $lang->repo->notice->delete = 'Do you want to delete this repo?'; $lang->repo->notice->successDelete = 'Repository is removed.'; $lang->repo->notice->commentContent = 'Comment'; +$lang->repo->notice->deleteReview = 'Do you want to delete this review?'; $lang->repo->notice->deleteBug = 'Do you want to delete this bug?'; $lang->repo->notice->deleteComment = 'Do you want to delete this comment?'; $lang->repo->notice->lastSyncTime = 'Last Sync:';