conflict resolution now properly shows values from any field type

Author: benkeen

admin/forms/edit_submission.php

@@ -56,6 +56,7 @@
 $failed_validation = false;
 $changed_fields = array();
 
+
 if (isset($_POST) && !empty($_POST)) {
 
 	if (isset($_POST["core__reconcile_changed_fields"])) {
@@ -156,7 +157,6 @@
 	Sessions::clear("conflicted_user_values");
 	Submissions::trackCurrentEditSubmissionFields($grouped_fields, $submission_id, $view_id, $tab_number);
 } else {
-
 	$user_values = array();
 	foreach ($changed_fields as $changed_field_name => $changed_info) {
 		foreach ($grouped_fields as $group) {
@@ -187,11 +187,10 @@
 			}
 		}
 	}
-
 	Sessions::set("conflicted_user_values", $user_values);
 }
 
-$page_field_ids      = array();
+$page_field_ids = array();
 $page_field_type_ids = array();
 $page_has_required_fields = false;
 foreach ($grouped_fields as $group) {
@@ -283,12 +282,12 @@
         "phrase_please_confirm", "word_no", "word_yes", "word_close", "phrase_validation_error"
     )
 );
-$page_vars["head_string"] =<<< EOF
+$page_vars["head_string"] =<<< END
     <script src="$root_url/global/scripts/manage_submissions.js"></script>
     <script src="$root_url/global/scripts/field_types.php"></script>
     <link rel="stylesheet" href="$root_url/global/css/field_types.php" type="text/css" />
 $shared_resources
-EOF;
+END;
 $page_vars["head_js"] =<<< END
 $validation_js
 END;

global/code/FieldTypes.class.php

@@ -705,8 +705,7 @@ public static function getFieldTypeProcessingInfo()
 
 
 	/**
-	 * Used in the ft_update_submission function. This retrieves all setting information for a
-	 * field - including the field type settings that weren't overridden.
+	 * This retrieves all setting information for a field - including the field type settings that weren't overridden.
 	 *
 	 * @param $field_ids
 	 * @return array a hash of [field_id][identifier] = values

global/code/Submissions.class.php

@@ -1550,6 +1550,11 @@ public static function getChangedFieldsSinceLastRender($form_id, $view_id, $subm
 			return array();
 		}
 
+		// expensive operations, so just load them once if need by
+		$form_fields = array();
+		$field_types_processing_info = array();
+		$field_settings = array();
+
 		$changed = array();
 		foreach ($view_fields as $field_name => $value) {
 
@@ -1558,17 +1563,29 @@ public static function getChangedFieldsSinceLastRender($form_id, $view_id, $subm
 				continue;
 			}
 
-			if ($last_edit_submission_state["data"][$field_name] !== $value &&
-				$value !== $post[$field_name]) {
+			if ($last_edit_submission_state["data"][$field_name] !== $value && $value !== $post[$field_name]) {
+
+				if (empty($form_fields)) {
+					$form_fields = Fields::getFormFields($form_id);
+					$field_types_processing_info = FieldTypes::getFieldTypeProcessingInfo();
+
+					// this gets all settings for the fields, taking into account whatever has been overridden
+					$field_ids = (!empty($post["field_ids"])) ? explode(",", $post["field_ids"]) : array();
+					$field_settings = FieldTypes::getFormFieldFieldTypeSettings($field_ids, $form_fields);
+				}
 
-				// TODO here we need to construct a new user_value (i.e. what's going to be stored in the database for the users
-				// current submission). There, the field type rendering method will handle displaying it appropriately. This
-				// should work for all field types.
-				// list ($value, $file_field) = self::getSaveFieldValueFromUpdateRequest($post, $form_field, $field_settings, $field_types_processing_info);
+				$form_field = array();
+				foreach ($form_fields as $row) {
+					if ($row["field_name"] == $field_name) {
+						$form_field = $row;
+						break;
+					}
+				}
+				list ($user_value, $file_field) = self::getSaveFieldValueFromUpdateRequest($post, $form_field, $field_settings, $field_types_processing_info);
 
 				$changed[$field_name] = array(
 					"db_value" => $value,
-					"user_value" => $post[$field_name] // TODO this is what changes
+					"user_value" => $user_value
 				);
 			}
 		}