feat(Save) set default values for fields that are not given in quick …

…create, filter fields forms, and web service create
tsolucio · Apr 18, 2021 · fafe91c · fafe91c
1 parent 3f57ef7
commit fafe91c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/Smarty/templates/QuickCreateHidden.tpl b/Smarty/templates/QuickCreateHidden.tpl
@@ -10,7 +10,7 @@
 -->*}
 
 <form name="QcEditView" onSubmit="return getFormValidate();" method="POST" action="index.php" ENCTYPE="multipart/form-data">
-
+	<input type="hidden" name="savefromqc" value="1">
 {if isset($FROM) && $FROM eq 'popup'}
 	<input type="hidden" name="from" value="{$FROM}">
 	<input type="hidden" name="return_action" value="Popup">

diff --git a/include/Webservices/Create.php b/include/Webservices/Create.php
@@ -68,11 +68,9 @@ function vtws_create($elementType, $element, $user) {
 	}
 
 	foreach ($meta->getModuleFields() as $fieldName => $webserviceField) {
-		if ($webserviceField->getUIType() == 15 || $webserviceField->getUIType() == 16) {
-			$dval = $webserviceField->getDefault();
-			if (!isset($element[$fieldName]) && !empty($dval)) {
-				$element[$fieldName] = $dval;
-			}
+		$dval = $webserviceField->getDefault();
+		if (!isset($element[$fieldName]) && !empty($dval)) {
+			$element[$fieldName] = $dval;
 		}
 	}
 

diff --git a/include/utils/CommonUtils.php b/include/utils/CommonUtils.php
@@ -1788,7 +1788,7 @@ function mkdirs($dir, $mode = 0777, $recursive = true) {
 
 /**
  * This function is used to set the Object values from the REQUEST values.
- * @param  object reference $focus - reference of the object
+ * @param object CRM object to fill with values
  */
 function setObjectValuesFromRequest($focus) {
 	global $log;
@@ -1816,6 +1816,13 @@ function setObjectValuesFromRequest($focus) {
 	if (!empty($_REQUEST['cbuuid'])) {
 		$focus->column_fields['cbuuid'] = vtlib_purify($_REQUEST['cbuuid']);
 	}
+	if (!empty($_REQUEST['savefromqc']) || !empty($_REQUEST['FILTERFIELDSMAP'])) {
+		foreach (getFieldsWithDefaultValue(getTabid($moduleName)) as $fname => $fvalue) {
+			if (empty($focus->column_fields[$fname]) && !isset($_REQUEST[$fname])) {
+				$focus->column_fields[$fname] = $fvalue;
+			}
+		}
+	}
 	if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'EditView')) {
 		$cbfrommodule = $moduleName;
 		$cbfrom = CRMEntity::getInstance($cbfrommodule);