Commit d0956a98 authored by Donald Cook's avatar Donald Cook Committed by Simon Knox

Moved template warning below type

parent 2116bb0c
.form-group.row.js-template-warning.mb-0.hidden.js-issuable-template-warning{ :class => ("gl-mb-5!" if issuable.supports_issue_type? && can?(current_user, :admin_issue, @project)) } .form-group.row.js-template-warning.hidden.js-issuable-template-warning
.offset-sm-2.col-sm-10 .col-sm-12
.warning_message.mb-0{ role: 'alert' } .warning_message.mb-0{ role: 'alert' }
%btn.js-close-btn.js-dismiss-btn.close{ type: "button", "aria-hidden": true, "aria-label": _("Close") } %btn.js-close-btn.js-dismiss-btn.close{ type: "button", "aria-hidden": true, "aria-label": _("Close") }
= sprite_icon("close") = sprite_icon("close")
......
...@@ -14,6 +14,9 @@ ...@@ -14,6 +14,9 @@
- if model.is_a?(Issuable) - if model.is_a?(Issuable)
= render 'shared/issuable/form/template_selector', issuable: model = render 'shared/issuable/form/template_selector', issuable: model
= render 'shared/form_elements/apply_template_warning', issuable: model
= render layout: 'shared/md_preview', locals: { url: preview_url, referenced_users: true } do = render layout: 'shared/md_preview', locals: { url: preview_url, referenced_users: true } do
= render 'shared/zen', f: form, attr: :description, = render 'shared/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',
......
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
= 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 } }
= render 'shared/form_elements/apply_template_warning', issuable: issuable
= render 'shared/issuable/form/type_selector', issuable: issuable, form: form = render 'shared/issuable/form/type_selector', issuable: issuable, form: form
= render 'shared/form_elements/description', model: issuable, form: form, project: project = render 'shared/form_elements/description', model: issuable, form: form, project: project
......
---
title: Moved template warning below type
merge_request: 47103
author:
type: fixed
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