Skip to content

Commit e4c691b

Browse files
David J. DavisMichaelRBond
David J. Davis
authored and
MichaelRBond
committed
Changing JavaScript to reveal fields. (#265)
* Changing JavaScript to reveal fields. * Fix incorrect number of fields on form insert * Display selected option text ... instead of ID number, for select fields in metadata forms * Bug FIx: Correct issue where adding an element to a metadata form would remove it from production
1 parent 1e87dc5 commit e4c691b

4 files changed

Lines changed: 12 additions & 23 deletions

File tree

‎public_html/formCreator/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
}
166166
else {
167167
// Insert into forms table
168-
$sql = sprintf("INSERT INTO `forms` (title, description, fields, idno, submitButton, updateButton, container, production, metadata, exportPublic, exportOAI, objPublicReleaseShow, objPublicReleaseDefaultTrue, count, displayTitle, objectTitleField, linkTitle) VALUES ('%s',%s,'%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s',%s)",
168+
$sql = sprintf("INSERT INTO `forms` (title, description, fields, idno, submitButton, updateButton, container, production, metadata, exportPublic, exportOAI, objPublicReleaseShow, objPublicReleaseDefaultTrue, count, displayTitle, objectTitleField, linkTitle) VALUES ('%s',%s,'%s','%s','%s','%s','%s','%s','%s','%s','%s', '%s', '%s','%s','%s','%s',%s)",
169169
$engine->openDB->escape($form['formTitle']),
170170
isset($form['formDescription']) ? "'".$engine->openDB->escape($form['formDescription'])."'" : "NULL",
171171
encodeFields($fields),

‎public_html/includes/classes/forms.php‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1157,12 +1157,19 @@ public static function buildEditTable($formID) {
11571157
);
11581158

11591159
foreach ($form['fields'] as $field) {
1160+
1161+
$field_value = (isset($objects[$I]['data'][$field['name']]))?htmlSanitize($objects[$I]['data'][$field['name']]):"";
1162+
if ($field['type'] == "select" && !is_empty($field_value)) {
1163+
$field_object = objects::get($field_value);
1164+
$field_value = $field_object['data'][$field['choicesField']];
1165+
}
1166+
11601167
$temp[] = sprintf('<input type="%s" style="%s" name="%s_%s" value="%s" readonly />',
11611168
$field['type'],
11621169
$field['style'],
11631170
$field['name'],
11641171
$objects[$I]['ID'],
1165-
(isset($objects[$I]['data'][$field['name']]))?htmlSanitize($objects[$I]['data'][$field['name']]):""
1172+
$field_value
11661173
);
11671174
}
11681175

‎public_html/includes/js/build/formBuilder/formBuilder.js‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -951,11 +951,8 @@ function formSettingsBindings() {
951951
if (idnoType.length === 0) {
952952
$("#formSettings_formProduction").removeAttr("disabled").removeAttr("title");
953953
fieldAdd.find("li:contains('ID Number')").hide();
954-
fieldAdd.find("li:contains('Paragraph Text')").hide();
955954
fieldAdd.find("li:contains('Radio')").hide();
956955
fieldAdd.find("li:contains('Checkboxes')").hide();
957-
fieldAdd.find("li:contains('Dropdown')").hide();
958-
fieldAdd.find("li:contains('Multi-Select')").hide();
959956
fieldAdd.find("li:contains('File Upload')").hide();
960957
fieldAdd.find("li:contains('WYSIWYG')").hide();
961958
fieldAdd.find("li:contains('Field Set')").parent().hide().prev().hide();
@@ -965,11 +962,8 @@ function formSettingsBindings() {
965962
idnoType.parent().parent().remove();
966963
$("#formSettings_formProduction").removeAttr("disabled").removeAttr("title");
967964
fieldAdd.find("li:contains('ID Number')").hide();
968-
fieldAdd.find("li:contains('Paragraph Text')").hide();
969965
fieldAdd.find("li:contains('Radio')").hide();
970966
fieldAdd.find("li:contains('Checkboxes')").hide();
971-
fieldAdd.find("li:contains('Dropdown')").hide();
972-
fieldAdd.find("li:contains('Multi-Select')").hide();
973967
fieldAdd.find("li:contains('File Upload')").hide();
974968
fieldAdd.find("li:contains('WYSIWYG')").hide();
975969
fieldAdd.find("li:contains('Field Set')").parent().hide().prev().hide();
@@ -983,11 +977,8 @@ function formSettingsBindings() {
983977
$("#formSettings_linkTitle_container").hide();
984978

985979
fieldAdd.find("li:contains('ID Number')").show();
986-
fieldAdd.find("li:contains('Paragraph Text')").show();
987980
fieldAdd.find("li:contains('Radio')").show();
988981
fieldAdd.find("li:contains('Checkboxes')").show();
989-
fieldAdd.find("li:contains('Dropdown')").show();
990-
fieldAdd.find("li:contains('Multi-Select')").show();
991982
fieldAdd.find("li:contains('File Upload')").show();
992983
fieldAdd.find("li:contains('WYSIWYG')").show();
993984
fieldAdd.find("li:contains('Field Set')").parent().show().prev().show();
@@ -1095,11 +1086,11 @@ function addNewField(item) {
10951086
// Display settings for new field
10961087
$("#formPreview_"+newID).click();
10971088

1098-
if ($("#formSettings_formMetadata").not(":checked")) {
1089+
if (!$("#formSettings_formMetadata").is(":checked")) {
10991090
// Enable/disable Production Form setting based on whether an idno field exists
11001091
if ($("#formPreview").find("input[name^=type_][value=idno]").length === 0) {
11011092
$("#formSettings_formProduction").prop({
1102-
checked: false,
1093+
checked: false, // this one?
11031094
disabled: true,
11041095
title: "This form needs an ID Number field.",
11051096
});

‎public_html/includes/js/develop/createForm_form.js‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -951,11 +951,8 @@ function formSettingsBindings() {
951951
if (idnoType.length === 0) {
952952
$("#formSettings_formProduction").removeAttr("disabled").removeAttr("title");
953953
fieldAdd.find("li:contains('ID Number')").hide();
954-
fieldAdd.find("li:contains('Paragraph Text')").hide();
955954
fieldAdd.find("li:contains('Radio')").hide();
956955
fieldAdd.find("li:contains('Checkboxes')").hide();
957-
fieldAdd.find("li:contains('Dropdown')").hide();
958-
fieldAdd.find("li:contains('Multi-Select')").hide();
959956
fieldAdd.find("li:contains('File Upload')").hide();
960957
fieldAdd.find("li:contains('WYSIWYG')").hide();
961958
fieldAdd.find("li:contains('Field Set')").parent().hide().prev().hide();
@@ -965,11 +962,8 @@ function formSettingsBindings() {
965962
idnoType.parent().parent().remove();
966963
$("#formSettings_formProduction").removeAttr("disabled").removeAttr("title");
967964
fieldAdd.find("li:contains('ID Number')").hide();
968-
fieldAdd.find("li:contains('Paragraph Text')").hide();
969965
fieldAdd.find("li:contains('Radio')").hide();
970966
fieldAdd.find("li:contains('Checkboxes')").hide();
971-
fieldAdd.find("li:contains('Dropdown')").hide();
972-
fieldAdd.find("li:contains('Multi-Select')").hide();
973967
fieldAdd.find("li:contains('File Upload')").hide();
974968
fieldAdd.find("li:contains('WYSIWYG')").hide();
975969
fieldAdd.find("li:contains('Field Set')").parent().hide().prev().hide();
@@ -983,11 +977,8 @@ function formSettingsBindings() {
983977
$("#formSettings_linkTitle_container").hide();
984978

985979
fieldAdd.find("li:contains('ID Number')").show();
986-
fieldAdd.find("li:contains('Paragraph Text')").show();
987980
fieldAdd.find("li:contains('Radio')").show();
988981
fieldAdd.find("li:contains('Checkboxes')").show();
989-
fieldAdd.find("li:contains('Dropdown')").show();
990-
fieldAdd.find("li:contains('Multi-Select')").show();
991982
fieldAdd.find("li:contains('File Upload')").show();
992983
fieldAdd.find("li:contains('WYSIWYG')").show();
993984
fieldAdd.find("li:contains('Field Set')").parent().show().prev().show();
@@ -1095,7 +1086,7 @@ function addNewField(item) {
10951086
// Display settings for new field
10961087
$("#formPreview_"+newID).click();
10971088

1098-
if ($("#formSettings_formMetadata").not(":checked")) {
1089+
if (!$("#formSettings_formMetadata").is(":checked")) {
10991090
// Enable/disable Production Form setting based on whether an idno field exists
11001091
if ($("#formPreview").find("input[name^=type_][value=idno]").length === 0) {
11011092
$("#formSettings_formProduction").prop({

0 commit comments

Comments
 (0)