kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Display secondary button only in resolvable noteables

Browse source
This commit is contained in:
Alfredo Sumaran 2017-04-05 20:11:38 -05:00
parent 46f3e37ddf
commit 9ee6b0ce8f
2 changed files with 31 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/assets/javascripts/comment_type_toggle.js
View file

@ -12,19 +12,24 @@ class CommentTypeToggle {
initDroplab() { initDroplab() {
this.droplab = new DropLab(); this.droplab = new DropLab();
this.droplab.init(this.trigger, this.list, [InputSetter], {
InputSetter: [{ const inputSetterConfig = [{
input: this.input, input: this.input,
valueAttribute: 'data-value', valueAttribute: 'data-value',
}, },
{ {
input: this.button, input: this.button,
valueAttribute: 'data-button-text', valueAttribute: 'data-button-text',
}, }];
{ if (this.secondaryButton) {
inputSetterConfig.push({
input: this.secondaryButton, input: this.secondaryButton,
valueAttribute: 'data-secondary-button-text', valueAttribute: 'data-secondary-button-text',
}], });
}
this.droplab.init(this.trigger, this.list, [InputSetter], {
InputSetter: inputSetterConfig
}); });
} }
} }

14
app/views/projects/notes/_comment_type_button.html.haml
View file

@ -1,4 +1,5 @@
- noteable_type = @note.noteable_type - noteable_type = @note.noteable_type
.btn-group.append-right-10.comment-type-dropdown.js-comment-type-dropdown .btn-group.append-right-10.comment-type-dropdown.js-comment-type-dropdown
%button.btn.btn-nr.btn-create.comment-btn.js-comment-button.js-comment-submit-button %button.btn.btn-nr.btn-create.comment-btn.js-comment-button.js-comment-submit-button
Comment Comment
@ -12,8 +13,17 @@
%strong Comment %strong Comment
%p= "Add a general comment to this #{noteable_type.titleize.downcase}." %p= "Add a general comment to this #{noteable_type.titleize.downcase}."
%li.divider %li.divider
%li#discussion{ data: { value: 'DiscussionNote', 'button-text' => 'Start discussion', 'secondary-button-text' => 'Start discussion & close merge request' } } - if @note.can_be_resolvable?
%li#discussion{ data: { value: 'DiscussionNote', 'button-text' => 'Start discussion', 'secondary-button-text' => "Start discussion & close #{noteable_type.titleize.downcase}" } }
= icon('check') = icon('check')
.description .description
%strong Start discussion %strong Start discussion
%p= "Discuss a specific suggestion or question#{@note.can_be_resolvable? ? ' that needs to be resolved' : ''}." %p
Discuss a specific suggestion or question that needs to be resolved.
- else
%li#discussion{ data: { value: 'DiscussionNote', 'button-text' => 'Start discussion', 'secondary-button-text' => "Start discussion & close #{noteable_type.titleize.downcase}"} }
= icon('check')
.description
%strong Start discussion
%p
Discuss a specific suggestion or question.