Add release description to new tag form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
850bb21b12
commit
312cf11b61
|
@ -39,6 +39,9 @@ class Dispatcher
|
|||
shortcut_handler = new ShortcutsNavigation()
|
||||
new DropzoneInput($('.merge-request-form'))
|
||||
new IssuableForm($('.merge-request-form'))
|
||||
when 'projects:tags:new'
|
||||
new ZenMode()
|
||||
new DropzoneInput($('.tag-form'))
|
||||
when 'projects:releases:edit'
|
||||
new ZenMode()
|
||||
new DropzoneInput($('.release-form'))
|
||||
|
|
|
@ -23,6 +23,13 @@ class Projects::TagsController < Projects::ApplicationController
|
|||
|
||||
if result[:status] == :success
|
||||
@tag = result[:tag]
|
||||
|
||||
if params[:release_description]
|
||||
release = @project.releases.find_or_initialize_by(tag: @tag.name)
|
||||
release.update_attributes(description: params[:release_description])
|
||||
release.save
|
||||
end
|
||||
|
||||
redirect_to namespace_project_tags_path(@project.namespace, @project)
|
||||
else
|
||||
@error = result[:message]
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
%h3.page-title
|
||||
%i.fa.fa-code-fork
|
||||
New tag
|
||||
= form_tag namespace_project_tags_path, method: :post, id: "new-tag-form", class: "form-horizontal" do
|
||||
= form_tag namespace_project_tags_path, method: :post, id: "new-tag-form", class: "form-horizontal tag-form" do
|
||||
.form-group
|
||||
= label_tag :tag_name, 'Name for new tag', class: 'control-label'
|
||||
.col-sm-10
|
||||
|
@ -23,6 +23,23 @@
|
|||
.col-sm-10
|
||||
= text_field_tag :message, nil, placeholder: 'Enter message.', required: false, tabindex: 3, class: 'form-control'
|
||||
.light (Optional) Entering a message will create an annotated tag.
|
||||
%hr
|
||||
.form-group
|
||||
= label_tag :release_description, 'Release description', class: 'control-label'
|
||||
.col-sm-10
|
||||
= render layout: 'projects/md_preview', locals: { preview_class: "md-preview", referenced_users: true } do
|
||||
.zennable
|
||||
%input#zen-toggle-comment.zen-toggle-comment(tabindex="-1" type="checkbox")
|
||||
.zen-backdrop
|
||||
= text_area_tag :release_description, nil, class: 'js-gfm-input markdown-area description js-quick-submit form-control', placeholder: ''
|
||||
%a.zen-enter-link(tabindex="-1" href="#")
|
||||
= icon('expand')
|
||||
Edit in fullscreen
|
||||
%a.zen-leave-link(href="#")
|
||||
= icon('compress')
|
||||
|
||||
= render 'projects/notes/hints'
|
||||
.help-block You can add release description to your tag. It will be stored in GitLab database and displayed on tags page
|
||||
.form-actions
|
||||
= button_tag 'Create tag', class: 'btn btn-create', tabindex: 3
|
||||
= link_to 'Cancel', namespace_project_tags_path(@project.namespace, @project), class: 'btn btn-cancel'
|
||||
|
|
Loading…
Reference in New Issue