From f5a39b114812683c11f059ae862dd88214d3a358 Mon Sep 17 00:00:00 2001 From: tworrall Date: Wed, 20 Jun 2012 16:03:50 +0000 Subject: [PATCH] removed testing comments from form, fixed setType issue in js --- .../freemarker/edit/forms/autoCompleteObjectPropForm.ftl | 4 ---- .../freemarker/edit/forms/js/customFormWithAutocomplete.js | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/webapp/web/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl b/webapp/web/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl index 1b81c82f2..68765f935 100644 --- a/webapp/web/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl +++ b/webapp/web/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl @@ -50,10 +50,6 @@ <#--In order to fill out the subject--> <#assign acFilterForIndividuals = "['" + editConfiguration.subjectUri + "']" /> -range options ${rangeOptions?keys?size!"FUCK"} -<#if rangeOptionsExist >FUXINGEXIST!<#else>NOEXIST! - -

${formTitle}

<#if editConfiguration.propertySelectFromExisting = true> diff --git a/webapp/web/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js b/webapp/web/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js index a406d54e1..80ac8b655 100644 --- a/webapp/web/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js +++ b/webapp/web/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js @@ -136,7 +136,6 @@ var customForm = { // if ((!this.supportEdit) && (this.editMode == 'edit' || this.editMode == 'repair')) { if (this.editMode == 'edit' || this.editMode == 'repair') { this.initFormWithValidationErrors(); - this.initFormFullView(); } else if (this.findValidationErrors()) { this.initFormWithValidationErrors(); @@ -546,6 +545,10 @@ var customForm = { if (selectedType.val().length) { this.acTypes[acTypeKey] = selectedType.val(); this.typeName = selectedType.html(); + if ( this.editMode == 'edit' ) { + var $acSelect = this.acSelections[acTypeKey]; + $acSelect.find('label').html('Selected ' + this.typeName + ':'); + } } // reset to empty values; may not need else {