From 3196c52969fded4bf1cb2e2977ef5284a43ec02d Mon Sep 17 00:00:00 2001
From: Ioannis Kappas <ikappas@devworks.gr>
Date: Thu, 2 Apr 2015 11:18:42 +0300
Subject: [PATCH] added fieldset support to project and admin services views.
split field logic to separate template.
---
app/views/admin/services/_form.html.haml | 62 +++++++++------------
app/views/projects/services/_form.html.haml | 62 +++++++++------------
app/views/shared/_field.html.haml | 24 ++++++++
3 files changed, 74 insertions(+), 74 deletions(-)
create mode 100644 app/views/shared/_field.html.haml
diff --git a/app/views/admin/services/_form.html.haml b/app/views/admin/services/_form.html.haml
index eb7a099bfe2..34ca7776c9e 100644
--- a/app/views/admin/services/_form.html.haml
+++ b/app/views/admin/services/_form.html.haml
@@ -3,7 +3,7 @@
%p #{@service.description} template
-= form_for :service, url: admin_application_settings_service_path, method: :put, html: { class: 'form-horizontal fieldset-form' } do |f|
+= form_for :service, url: admin_application_settings_service_path, method: :put, html: { class: 'form-horizontal fieldset-form' } do |form|
- if @service.errors.any?
#error_explanation
.alert.alert-danger
@@ -15,80 +15,68 @@
= markdown @service.help
.form-group
- = f.label :active, "Active", class: "control-label"
+ = form.label :active, "Active", class: "control-label"
.col-sm-10
- = f.check_box :active
+ = form.check_box :active
- if @service.supported_events.length > 1
.form-group
- = f.label :url, "Trigger", class: 'control-label'
+ = form.label :url, "Trigger", class: 'control-label'
.col-sm-10
- if @service.supported_events.include?("push")
%div
- = f.check_box :push_events, class: 'pull-left'
+ = form.check_box :push_events, class: 'pull-left'
.prepend-left-20
- = f.label :push_events, class: 'list-label' do
+ = form.label :push_events, class: 'list-label' do
%strong Push events
%p.light
This url will be triggered by a push to the repository
- if @service.supported_events.include?("tag_push")
%div
- = f.check_box :tag_push_events, class: 'pull-left'
+ = form.check_box :tag_push_events, class: 'pull-left'
.prepend-left-20
- = f.label :tag_push_events, class: 'list-label' do
+ = form.label :tag_push_events, class: 'list-label' do
%strong Tag push events
%p.light
This url will be triggered when a new tag is pushed to the repository
- if @service.supported_events.include?("note")
%div
- = f.check_box :note_events, class: 'pull-left'
+ = form.check_box :note_events, class: 'pull-left'
.prepend-left-20
- = f.label :note_events, class: 'list-label' do
+ = form.label :note_events, class: 'list-label' do
%strong Comments
%p.light
This url will be triggered when someone adds a comment
- if @service.supported_events.include?("issue")
%div
- = f.check_box :issues_events, class: 'pull-left'
+ = form.check_box :issues_events, class: 'pull-left'
.prepend-left-20
- = f.label :issues_events, class: 'list-label' do
+ = form.label :issues_events, class: 'list-label' do
%strong Issues events
%p.light
This url will be triggered when an issue is created
- if @service.supported_events.include?("merge_request")
%div
- = f.check_box :merge_requests_events, class: 'pull-left'
+ = form.check_box :merge_requests_events, class: 'pull-left'
.prepend-left-20
- = f.label :merge_requests_events, class: 'list-label' do
+ = form.label :merge_requests_events, class: 'list-label' do
%strong Merge Request events
%p.light
This url will be triggered when a merge request is created
- @service.fields.each do |field|
- - name = field[:name]
- - title = field[:title] || name.humanize
- - value = @service.send(name) unless field[:type] == 'password'
- type = field[:type]
- - placeholder = field[:placeholder]
- - choices = field[:choices]
- - default_choice = field[:default_choice]
- - help = field[:help]
- .form-group
- = f.label name, title, class: "control-label"
- .col-sm-10
- - if type == 'text'
- = f.text_field name, class: "form-control", placeholder: placeholder
- - elsif type == 'textarea'
- = f.text_area name, rows: 5, class: "form-control", placeholder: placeholder
- - elsif type == 'checkbox'
- = f.check_box name
- - elsif type == 'select'
- = f.select name, options_for_select(choices, value ? value : default_choice), {}, { class: "form-control" }
- - elsif type == 'password'
- = f.password_field name, class: 'form-control'
- - if help
- %span.help-block= help
+ - if type == 'fieldset'
+ - fields = field[:fields]
+ - legend = field[:legend]
+
+ %fieldset
+ %legend= legend
+ - fields.each do |subfield|
+ = render 'shared/field', form: form, field: subfield
+ - else
+ = render 'shared/field', form: form, field: field
.form-actions
- = f.submit 'Save', class: 'btn btn-save'
+ = form.submit 'Save', class: 'btn btn-save'
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index ce6b7a0737a..1b465e3addd 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -10,7 +10,7 @@
%hr
-= form_for(@service, as: :service, url: namespace_project_service_path(@project.namespace, @project, @service.to_param), method: :put, html: { class: 'form-horizontal' }) do |f|
+= form_for(@service, as: :service, url: namespace_project_service_path(@project.namespace, @project, @service.to_param), method: :put, html: { class: 'form-horizontal' }) do |form|
- if @service.errors.any?
.alert.alert-danger
%ul
@@ -23,83 +23,71 @@
= markdown @service.help
.form-group
- = f.label :active, "Active", class: "control-label"
+ = form.label :active, "Active", class: "control-label"
.col-sm-10
- = f.check_box :active
+ = form.check_box :active
- if @service.supported_events.length > 1
.form-group
- = f.label :url, "Trigger", class: 'control-label'
+ = form.label :url, "Trigger", class: 'control-label'
.col-sm-10
- if @service.supported_events.include?("push")
%div
- = f.check_box :push_events, class: 'pull-left'
+ = form.check_box :push_events, class: 'pull-left'
.prepend-left-20
- = f.label :push_events, class: 'list-label' do
+ = form.label :push_events, class: 'list-label' do
%strong Push events
%p.light
This url will be triggered by a push to the repository
- if @service.supported_events.include?("tag_push")
%div
- = f.check_box :tag_push_events, class: 'pull-left'
+ = form.check_box :tag_push_events, class: 'pull-left'
.prepend-left-20
- = f.label :tag_push_events, class: 'list-label' do
+ = form.label :tag_push_events, class: 'list-label' do
%strong Tag push events
%p.light
This url will be triggered when a new tag is pushed to the repository
- if @service.supported_events.include?("note")
%div
- = f.check_box :note_events, class: 'pull-left'
+ = form.check_box :note_events, class: 'pull-left'
.prepend-left-20
- = f.label :note_events, class: 'list-label' do
+ = form.label :note_events, class: 'list-label' do
%strong Comments
%p.light
This url will be triggered when someone adds a comment
- if @service.supported_events.include?("issue")
%div
- = f.check_box :issues_events, class: 'pull-left'
+ = form.check_box :issues_events, class: 'pull-left'
.prepend-left-20
- = f.label :issues_events, class: 'list-label' do
+ = form.label :issues_events, class: 'list-label' do
%strong Issues events
%p.light
This url will be triggered when an issue is created
- if @service.supported_events.include?("merge_request")
%div
- = f.check_box :merge_requests_events, class: 'pull-left'
+ = form.check_box :merge_requests_events, class: 'pull-left'
.prepend-left-20
- = f.label :merge_requests_events, class: 'list-label' do
+ = form.label :merge_requests_events, class: 'list-label' do
%strong Merge Request events
%p.light
This url will be triggered when a merge request is created
- @service.fields.each do |field|
- - name = field[:name]
- - title = field[:title] || name.humanize
- - value = service_field_value(field[:type], @service.send(name))
- type = field[:type]
- - placeholder = field[:placeholder]
- - choices = field[:choices]
- - default_choice = field[:default_choice]
- - help = field[:help]
- .form-group
- = f.label name, title, class: "control-label"
- .col-sm-10
- - if type == 'text'
- = f.text_field name, class: "form-control", placeholder: placeholder
- - elsif type == 'textarea'
- = f.text_area name, rows: 5, class: "form-control", placeholder: placeholder
- - elsif type == 'checkbox'
- = f.check_box name
- - elsif type == 'select'
- = f.select name, options_for_select(choices, value ? value : default_choice), {}, { class: "form-control" }
- - elsif type == 'password'
- = f.password_field name, placeholder: value, class: 'form-control'
- - if help
- %span.help-block= help
+ - if type == 'fieldset'
+ - fields = field[:fields]
+ - legend = field[:legend]
+
+ %fieldset
+ %legend= legend
+ - fields.each do |subfield|
+ = render 'shared/field', form: form, field: subfield
+ - else
+ = render 'shared/field', form: form, field: field
.form-actions
- = f.submit 'Save', class: 'btn btn-save'
+ = form.submit 'Save', class: 'btn btn-save'
- if @service.valid? && @service.activated?
- disabled = @service.can_test? ? '':'disabled'
diff --git a/app/views/shared/_field.html.haml b/app/views/shared/_field.html.haml
new file mode 100644
index 00000000000..30d37dceb30
--- /dev/null
+++ b/app/views/shared/_field.html.haml
@@ -0,0 +1,24 @@
+- name = field[:name]
+- title = field[:title] || name.humanize
+- value = service_field_value(field[:type], @service.send(name))
+- type = field[:type]
+- placeholder = field[:placeholder]
+- choices = field[:choices]
+- default_choice = field[:default_choice]
+- help = field[:help]
+
+.form-group
+ = form.label name, title, class: "control-label"
+ .col-sm-10
+ - if type == 'text'
+ = form.text_field name, class: "form-control", placeholder: placeholder
+ - elsif type == 'textarea'
+ = form.text_area name, rows: 5, class: "form-control", placeholder: placeholder
+ - elsif type == 'checkbox'
+ = form.check_box name
+ - elsif type == 'select'
+ = form.select name, options_for_select(choices, value ? value : default_choice), {}, { class: "form-control" }
+ - elsif type == 'password'
+ = form.password_field name, placeholder: value, class: 'form-control'
+ - if help
+ %span.help-block= help
--
GitLab