diff options
author | Robert Speicher <robert@gitlab.com> | 2016-05-10 17:10:07 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-05-10 17:10:07 +0000 |
commit | 48c80fdf43e44ae003753c81a832fc2c0eafdb5d (patch) | |
tree | 22ced31e05336a564b9ec16d5399cbc99e49420c | |
parent | 0cc8cee6cd58cfa8e34eccccb14fb146630f9cb7 (diff) | |
parent | bbc94e15a3f66852ac3283388327e25d92ae9c0a (diff) | |
download | gitlab-ce-48c80fdf43e44ae003753c81a832fc2c0eafdb5d.tar.gz |
Merge branch 'fix/remove-broken-inline-runner-desc-edit' into 'master'
Remove broken inline runner description edit form
This remove inline form for editing runnner's description.
It is broken because of missing partial / incorrect response and it also does not make much sense, since we have under 'Edit' button a form that makes it possible to edit more than just a description.
See merge request !4095
-rw-r--r-- | app/assets/javascripts/ci/application.js.coffee | 28 | ||||
-rw-r--r-- | app/views/admin/runners/_runner.html.haml | 12 |
2 files changed, 2 insertions, 38 deletions
diff --git a/app/assets/javascripts/ci/application.js.coffee b/app/assets/javascripts/ci/application.js.coffee index 05aa0f366bb..ca24c1d759f 100644 --- a/app/assets/javascripts/ci/application.js.coffee +++ b/app/assets/javascripts/ci/application.js.coffee @@ -1,34 +1,6 @@ -# This is a manifest file that'll be compiled into application.js, which will include all the files -# listed below. -# -# Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, -# or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path. -# -# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the -# the compiled file. -# -# WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD -# GO AFTER THE REQUIRES BELOW. -# #= require pager #= require jquery_nested_form #= require_tree . -# -$(document).on 'click', '.edit-runner-link', (event) -> - event.preventDefault() - - descr = $(this).closest('.runner-description').first() - descr.addClass('hide') - form = descr.next('.runner-description-form') - descrInput = form.find('input.description') - originalValue = descrInput.val() - form.removeClass('hide') - form.find('.cancel').on 'click', (event) -> - event.preventDefault() - - form.addClass('hide') - descrInput.val(originalValue) - descr.removeClass('hide') $(document).on 'click', '.assign-all-runner', -> $(this).replaceWith('<i class="fa fa-refresh fa-spin"></i> Assign in progress..') diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml index 6745e58deca..36b21eefdee 100644 --- a/app/views/admin/runners/_runner.html.haml +++ b/app/views/admin/runners/_runner.html.haml @@ -11,18 +11,10 @@ = link_to admin_runner_path(runner) do = runner.short_sha %td - .runner-description - = runner.description - %span (#{link_to 'edit', '#', class: 'edit-runner-link'}) - .runner-description-form.hide - = form_for [:admin, runner], remote: true, html: { class: 'form-inline' } do |f| - .form-group - = f.text_field :description, class: 'form-control' - = f.submit 'Save', class: 'btn' - %span (#{link_to 'cancel', '#', class: 'cancel'}) + = runner.description %td - if runner.shared? - \- + n/a - else = runner.projects.count(:all) %td |