Commit bc460fc1 authored by jj-ramirez's avatar jj-ramirez

Changes to template dropdown location

Fixed undefined issue on snippets partial

Changelog added fix

Small redundant variable fix
parent acb7f947
- project = local_assigns.fetch(:project) - project = local_assigns.fetch(:project)
- model = local_assigns.fetch(:model) - model = local_assigns.fetch(:model)
- form = local_assigns.fetch(:form) - form = local_assigns.fetch(:form)
- placeholder = model.is_a?(MergeRequest) ? _('Describe the goal of the changes and what reviewers should be aware of.') : _('Write a comment or drag your files here…') - placeholder = model.is_a?(MergeRequest) ? _('Describe the goal of the changes and what reviewers should be aware of.') : _('Write a comment or drag your files here…')
- supports_quick_actions = model.new_record? - supports_quick_actions = model.new_record?
...@@ -14,6 +16,8 @@ ...@@ -14,6 +16,8 @@
= form.label :description, 'Description', class: 'col-form-label col-sm-2' = form.label :description, 'Description', class: 'col-form-label col-sm-2'
.col-sm-10 .col-sm-10
- if model.is_a?(Issuable)
= render 'shared/issuable/form/template_selector', issuable: model
= render layout: 'projects/md_preview', locals: { url: preview_url, referenced_users: true } do = render layout: 'projects/md_preview', locals: { url: preview_url, referenced_users: true } do
= render 'projects/zen', f: form, attr: :description, = render 'projects/zen', f: form, attr: :description,
classes: 'note-textarea qa-issuable-form-description rspec-issuable-form-description', classes: 'note-textarea qa-issuable-form-description rspec-issuable-form-description',
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
.form-group.row .form-group.row
= form.label :title, class: 'col-form-label col-sm-2' = form.label :title, class: 'col-form-label col-sm-2'
= render 'shared/issuable/form/template_selector', issuable: issuable
= render 'shared/issuable/form/title', issuable: issuable, form: form, has_wip_commits: commits && commits.detect(&:work_in_progress?) = render 'shared/issuable/form/title', issuable: issuable, form: form, has_wip_commits: commits && commits.detect(&:work_in_progress?)
#js-suggestions{ data: { project_path: @project.full_path } } #js-suggestions{ data: { project_path: @project.full_path } }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- return unless issuable && issuable_templates(issuable).any? - return unless issuable && issuable_templates(issuable).any?
.col-sm-3.col-lg-2 .issuable-form-select-holder.selectbox.form-group
.js-issuable-selector-wrap{ data: { issuable_type: issuable.to_ability_name } } .js-issuable-selector-wrap{ data: { issuable_type: issuable.to_ability_name } }
= template_dropdown_tag(issuable) do = template_dropdown_tag(issuable) do
%ul.dropdown-footer-list %ul.dropdown-footer-list
......
---
title: Changes to template dropdown location
merge_request: 22049
author:
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment