litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed testing comments from form, fixed setType issue in js

Browse source
This commit is contained in:
tworrall 2012-06-20 16:03:50 +00:00
parent 0a109f1656
commit f5a39b1148
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/web/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
View file

@ -50,10 +50,6 @@
<#--In order to fill out the subject--> <#--In order to fill out the subject-->
<#assign acFilterForIndividuals = "['" + editConfiguration.subjectUri + "']" /> <#assign acFilterForIndividuals = "['" + editConfiguration.subjectUri + "']" />
range options ${rangeOptions?keys?size!"FUCK"}
<#if rangeOptionsExist >FUXINGEXIST!<#else>NOEXIST!</#if>
<h2>${formTitle}</h2> <h2>${formTitle}</h2>
<#if editConfiguration.propertySelectFromExisting = true> <#if editConfiguration.propertySelectFromExisting = true>

5
webapp/web/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js
View file

@ -136,7 +136,6 @@ var customForm = {
// if ((!this.supportEdit) && (this.editMode == 'edit' || this.editMode == 'repair')) { // if ((!this.supportEdit) && (this.editMode == 'edit' || this.editMode == 'repair')) {
if (this.editMode == 'edit' || this.editMode == 'repair') { if (this.editMode == 'edit' || this.editMode == 'repair') {
this.initFormWithValidationErrors(); this.initFormWithValidationErrors();
this.initFormFullView();
} }
else if (this.findValidationErrors()) { else if (this.findValidationErrors()) {
this.initFormWithValidationErrors(); this.initFormWithValidationErrors();
@ -546,6 +545,10 @@ var customForm = {
if (selectedType.val().length) { if (selectedType.val().length) {
this.acTypes[acTypeKey] = selectedType.val(); this.acTypes[acTypeKey] = selectedType.val();
this.typeName = selectedType.html(); 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 // reset to empty values; may not need
else { else {