Commit 88081a24 authored by Justin Ho's avatar Justin Ho

Add feature flag to TriggerFields

- Remove field[:type] == fieldset because it's no
longer used (there are no instances of it defined in services.
parent c19796e9
......@@ -45,6 +45,6 @@ export default {
<div>
<active-toggle v-if="showActive" v-bind="activeToggleProps" />
<jira-trigger-fields v-if="isJira" v-bind="triggerFieldsProps" />
<trigger-fields v-else :events="triggerEvents" :type="type" />
<trigger-fields v-else-if="triggerEvents.length" :events="triggerEvents" :type="type" />
</div>
</template>
......@@ -9,7 +9,7 @@
.service-settings
.js-vue-integration-settings{ data: { show_active: @service.show_active_box?.to_s, activated: (@service.active || @service.new_record?).to_s, type: @service.to_param, merge_request_events: @service.merge_requests_events.to_s,
commit_events: @service.commit_events.to_s, enable_comments: @service.comment_on_event_enabled.to_s, comment_detail: @service.comment_detail, trigger_events: @service.configurable_events_json } }
commit_events: @service.commit_events.to_s, enable_comments: @service.comment_on_event_enabled.to_s, comment_detail: @service.comment_detail, trigger_events: Feature.enabled?(:integration_form_refactor) ? @service.configurable_events_json : [] } }
- if @service.configurable_events.present? && !@service.is_a?(JiraService)
.form-group.row
......@@ -33,15 +33,4 @@ commit_events: @service.commit_events.to_s, enable_comments: @service.comment_on
= @service.class.event_description(event)
- @service.global_fields.each do |field|
- type = field[:type]
- 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
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