Merge branch 'merge-request-sidebar' into 'master'
Fixed bug where participants would not work correctly on merge requests Also fixed alignment bug with can't merge badge Closes #14478, #14494 See merge request !3329
This commit is contained in:
commit
62ffdbeb2d
|
@ -1,7 +1,7 @@
|
||||||
#= require jquery.waitforimages
|
|
||||||
|
|
||||||
class @IssuableContext
|
class @IssuableContext
|
||||||
constructor: ->
|
constructor: ->
|
||||||
|
@initParticipants()
|
||||||
|
|
||||||
new UsersSelect()
|
new UsersSelect()
|
||||||
$('select.select2').select2({width: 'resolve', dropdownAutoWidth: true})
|
$('select.select2').select2({width: 'resolve', dropdownAutoWidth: true})
|
||||||
|
|
||||||
|
@ -17,3 +17,27 @@ class @IssuableContext
|
||||||
block.find('.js-select2').select2("open")
|
block.find('.js-select2').select2("open")
|
||||||
|
|
||||||
$(".right-sidebar").niceScroll()
|
$(".right-sidebar").niceScroll()
|
||||||
|
|
||||||
|
initParticipants: ->
|
||||||
|
_this = @
|
||||||
|
$(document).on "click", ".js-participants-more", @toggleHiddenParticipants
|
||||||
|
|
||||||
|
$(".js-participants-author").each (i) ->
|
||||||
|
if i >= _this.PARTICIPANTS_ROW_COUNT
|
||||||
|
$(@)
|
||||||
|
.addClass "js-participants-hidden"
|
||||||
|
.hide()
|
||||||
|
|
||||||
|
toggleHiddenParticipants: (e) ->
|
||||||
|
e.preventDefault()
|
||||||
|
|
||||||
|
currentText = $(this).text().trim()
|
||||||
|
lessText = $(this).data("less-text")
|
||||||
|
originalText = $(this).data("original-text")
|
||||||
|
|
||||||
|
if currentText is originalText
|
||||||
|
$(this).text(lessText)
|
||||||
|
else
|
||||||
|
$(this).text(originalText)
|
||||||
|
|
||||||
|
$(".js-participants-hidden").toggle()
|
||||||
|
|
|
@ -7,7 +7,6 @@ class @Issue
|
||||||
# Prevent duplicate event bindings
|
# Prevent duplicate event bindings
|
||||||
@disableTaskList()
|
@disableTaskList()
|
||||||
@fixAffixScroll()
|
@fixAffixScroll()
|
||||||
@initParticipants()
|
|
||||||
if $('a.btn-close').length
|
if $('a.btn-close').length
|
||||||
@initTaskList()
|
@initTaskList()
|
||||||
@initIssueBtnEventListeners()
|
@initIssueBtnEventListeners()
|
||||||
|
@ -85,27 +84,3 @@ class @Issue
|
||||||
type: 'PATCH'
|
type: 'PATCH'
|
||||||
url: $('form.js-issuable-update').attr('action')
|
url: $('form.js-issuable-update').attr('action')
|
||||||
data: patchData
|
data: patchData
|
||||||
|
|
||||||
initParticipants: ->
|
|
||||||
_this = @
|
|
||||||
$(document).on "click", ".js-participants-more", @toggleHiddenParticipants
|
|
||||||
|
|
||||||
$(".js-participants-author").each (i) ->
|
|
||||||
if i >= _this.PARTICIPANTS_ROW_COUNT
|
|
||||||
$(@)
|
|
||||||
.addClass "js-participants-hidden"
|
|
||||||
.hide()
|
|
||||||
|
|
||||||
toggleHiddenParticipants: (e) ->
|
|
||||||
e.preventDefault()
|
|
||||||
|
|
||||||
currentText = $(this).text().trim()
|
|
||||||
lessText = $(this).data("less-text")
|
|
||||||
originalText = $(this).data("original-text")
|
|
||||||
|
|
||||||
if currentText is originalText
|
|
||||||
$(this).text(lessText)
|
|
||||||
else
|
|
||||||
$(this).text(originalText)
|
|
||||||
|
|
||||||
$(".js-participants-hidden").toggle()
|
|
||||||
|
|
|
@ -17,4 +17,4 @@
|
||||||
%a.js-participants-more{href: "#", data: {original_text: "+ #{participants_size - 7} more", less_text: "- show less"}}
|
%a.js-participants-more{href: "#", data: {original_text: "+ #{participants_size - 7} more", less_text: "- show less"}}
|
||||||
+ #{participants_extra} more
|
+ #{participants_extra} more
|
||||||
:javascript
|
:javascript
|
||||||
Issue.prototype.PARTICIPANTS_ROW_COUNT = #{participants_row};
|
IssuableContext.prototype.PARTICIPANTS_ROW_COUNT = #{participants_row};
|
||||||
|
|
|
@ -33,11 +33,11 @@
|
||||||
.value.bold.hide-collapsed
|
.value.bold.hide-collapsed
|
||||||
- if issuable.assignee
|
- if issuable.assignee
|
||||||
= link_to_member(@project, issuable.assignee, size: 32) do
|
= link_to_member(@project, issuable.assignee, size: 32) do
|
||||||
|
- if issuable.instance_of?(MergeRequest) && !issuable.can_be_merged_by?(issuable.assignee)
|
||||||
|
%span.pull-right.cannot-be-merged{ data: { toggle: 'tooltip', placement: 'left' }, title: 'Not allowed to merge' }
|
||||||
|
= icon('exclamation-triangle')
|
||||||
%span.username
|
%span.username
|
||||||
= issuable.assignee.to_reference
|
= issuable.assignee.to_reference
|
||||||
- if issuable.instance_of?(MergeRequest) && !issuable.can_be_merged_by?(issuable.assignee)
|
|
||||||
%a.pull-right.cannot-be-merged{href: '#', data: {toggle: 'tooltip'}, title: 'Not allowed to merge'}
|
|
||||||
= icon('exclamation-triangle')
|
|
||||||
- else
|
- else
|
||||||
.light None
|
.light None
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue