diff --git a/app/assets/javascripts/custom_form_builder.coffee b/app/assets/javascripts/custom_form_builder.coffee
index bdcc4905f8..1216fdea09 100644
--- a/app/assets/javascripts/custom_form_builder.coffee
+++ b/app/assets/javascripts/custom_form_builder.coffee
@@ -56,12 +56,13 @@ class CIF.CustomFormBuilder
self.preventClickEnterOrTab(fld)
),50
- eventFileOption: ->
+ eventFileOption: (fields = []) ->
self = @
onadd: (fld) ->
$('.file-field').find('.className-wrap, .placeholder-wrap, .subtype-wrap, .value-wrap, .access-wrap, .description-wrap, .name-wrap').hide()
self.handleCheckingForm()
self.preventClickEnterOrTab(fld)
+ self.handleAddTranslateLabelField(fld, fields)
onclone: (fld) ->
setTimeout ( ->
self.handleCheckingForm()
@@ -74,7 +75,6 @@ class CIF.CustomFormBuilder
$('.number-field').find('.className-wrap, .placeholder-wrap, .value-wrap, .step-wrap, .access-wrap, .description-wrap, .name-wrap').hide()
self.handleCheckingForm()
self.preventClickEnterOrTab(fld)
- console.log(fields)
self.handleAddTranslateLabelField(fld, fields)
onclone: (fld) ->
setTimeout ( ->
@@ -278,6 +278,6 @@ class CIF.CustomFormBuilder
if fields[index - 1]
localLabel = if fields[index - 1][localLabelName] then fields[index - 1][localLabelName] else localLabel
frmHolder = fldElement.find('.frm-holder')
- localLabelBlock = "
"
+ localLabelBlock = ""
localLabelBlockElement = $.parseHTML(localLabelBlock)
frmHolder.find('.label-wrap').after(localLabelBlockElement)
diff --git a/app/assets/javascripts/multiple_form/form.coffee b/app/assets/javascripts/multiple_form/form.coffee
index eb71c681a2..4ad363d4a9 100644
--- a/app/assets/javascripts/multiple_form/form.coffee
+++ b/app/assets/javascripts/multiple_form/form.coffee
@@ -76,7 +76,6 @@ CIF.Client_trackingsNew = CIF.Client_trackingsCreate = CIF.Client_custom_fieldsN
$('input[type="text"]').on 'keyup', (e) ->
el = $(@)
if el.hasClass('date-picker')
- console.log('ddddaaaattteee')
else
el.parent().next().find('#' + el.data('local-input')).val(el.val())
diff --git a/app/assets/javascripts/program_streams/form.coffee b/app/assets/javascripts/program_streams/form.coffee
index 764d704d3a..2e950e7f99 100644
--- a/app/assets/javascripts/program_streams/form.coffee
+++ b/app/assets/javascripts/program_streams/form.coffee
@@ -288,7 +288,7 @@ CIF.Program_streamsNew = CIF.Program_streamsEdit = CIF.Program_streamsCreate = C
typeUserEvents: {
'checkbox-group': builderOption.eventCheckboxOption(fields)
date: builderOption.eventDateOption(fields)
- file: builderOption.eventFileOption()
+ file: builderOption.eventFileOption(fields)
number: builderOption.eventNumberOption(fields)
'radio-group': builderOption.eventRadioOption(fields)
select: builderOption.eventSelectOption(fields)
@@ -522,7 +522,6 @@ CIF.Program_streamsNew = CIF.Program_streamsEdit = CIF.Program_streamsCreate = C
_handleSetValueToField = ->
for formBuilder in @formBuilder
- console.log(formBuilder.actions.save(), 'form builder actions')
element = formBuilder.element
specialCharacters = { "&": "&", "<": "<", ">": ">", '"': "&qoute;" }
format = new CIF.FormatSpecialCharacters()
diff --git a/app/views/client_enrolled_programs/show.haml b/app/views/client_enrolled_programs/show.haml
index aa7246abce..0fef105a7c 100644
--- a/app/views/client_enrolled_programs/show.haml
+++ b/app/views/client_enrolled_programs/show.haml
@@ -28,9 +28,10 @@
%td.align-justify
= label
%td.align-justify
- - key = convert_bracket(label, @client_enrollment.properties)
- - key = I18n.locale.to_s === I18n.default_locale.to_s ? key : "Local_label #{key}"
- if type == 'file'
+ - key = convert_bracket(key.html_safe, @client_enrollment.properties)
= render 'shared/form_builder/list_attachment', label: key, resource: @client_enrollment
- else
+ - key = convert_bracket(label, @client_enrollment.properties)
+ - key = I18n.locale.to_s === I18n.default_locale.to_s ? key : "Local_label #{key}"
= display_custom_properties(@client_enrollment.properties[key])
diff --git a/app/views/shared/form_builder/_file_field.haml b/app/views/shared/form_builder/_file_field.haml
index f7f97ae3ff..dd88a0d17d 100644
--- a/app/views/shared/form_builder/_file_field.haml
+++ b/app/views/shared/form_builder/_file_field.haml
@@ -1,9 +1,10 @@
+- label = field_label(property)
%div{data: {used: "#{f.object.file.any?}"}}
= f.input :name, as: :hidden, input_html: { name: "#{entity.object_name}[form_builder_attachments_attributes][#{property['name'].split('-').last}][name]", value: property['label'] }
%label.control-label
%abbr{ title: 'repuired' }
= '*' if property['required'].present? && f.object.file.empty?
- = property['label'].html_safe
+ = label.html_safe
= f.input :file, as: :file, label: false, required: property['required'].present?, input_html: { name: "#{entity.object_name}[form_builder_attachments_attributes][#{property['name'].split('-').last}][file][]", multiple: property['multiple'].present?, value: f.object.file }
%span.help-block.hidden
diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb
index 271747ec3b..3fbfcb2736 100644
--- a/config/deploy/staging.rb
+++ b/config/deploy/staging.rb
@@ -8,7 +8,8 @@
# server 'db.example.com', user: 'deploy', roles: %w{db}
set :stage, 'staging'
-set :branch, proc { `git rev-parse --abbrev-ref staging`.chomp }
+set :branch, proc { `git rev-parse --abbrev-ref OSC-17`.chomp }
+# set :branch, proc { `git rev-parse --abbrev-ref staging`.chomp }
server '52.220.217.164', user: 'deployer', roles: %w{app web db}