Merge remote-tracking branch 'refs/remotes/gitdedalo/v6_developer' in…

…to v6_developer # Conflicts: # core/base/version.inc
renderpci · Nov 5, 2023 · 6d0ab50 · 6d0ab50
2 parents d7946fd + f2fd73a
commit 6d0ab50
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 22 deletions.
diff --git a/core/api/v1/common/class.dd_utils_api.php b/core/api/v1/common/class.dd_utils_api.php
@@ -1393,7 +1393,7 @@ private static function get_known_mime_types() : array {
 			// geojson
 			'geojson'	=> 'application/geo+json',
 			'kml'		=> 'application/vnd.google-earth.kml+xml',
-			'kmz'		=>  'application/vnd.google-earth.kmz'
+			'kmz'		=> 'application/vnd.google-earth.kmz'
 		);
 
 

diff --git a/core/component_iri/class.component_iri.php b/core/component_iri/class.component_iri.php
@@ -246,31 +246,37 @@ public function get_valor($lang=DEDALO_DATA_LANG, $index='all') : ?string {
 		$dato = $this->get_dato();
 
 		if ($index==='all') {
-			$valor = null;
+
 			$ar_val = [];
-			foreach ($dato as $value) {
+			if (is_array($dato)) {
+				foreach ($dato as $value) {
 
-				$ar_line = [];
+					$ar_line = [];
 
-				if (!empty($value->title)) {
-					$ar_line[] = $value->title;
-				}
-				if (!empty($value->iri)) {
-					$ar_line[] = $value->iri;
-				}
+					if (!empty($value->title)) {
+						$ar_line[] = $value->title;
+					}
+					if (!empty($value->iri)) {
+						$ar_line[] = $value->iri;
+					}
 
-				if (!empty($ar_line)) {
+					if (!empty($ar_line)) {
 
-					$ar_val[] = implode(' | ', $ar_line);
+						$ar_val[] = implode(' | ', $ar_line);
+					}
 				}
 			}
 
-			$valor = !empty($ar_val) ? implode(', ', $ar_val) : null;
+			$valor = !empty($ar_val)
+				? implode(', ', $ar_val)
+				: null;
 
 		}else{
 
 			$index = (int)$index;
-			$valor = isset($dato[$index]) ? $dato[$index] : null;
+			$valor = isset($dato[$index])
+				? $dato[$index]
+				: null;
 		}
 
 

diff --git a/core/component_portal/v5_component_autocomplete_hi.php b/core/component_portal/v5_component_autocomplete_hi.php
@@ -100,7 +100,7 @@
 
 		// fields_separator. (!) Note here that more than one value can be returned by this method. To avoid duplicity of ',' separator, use '-' as default
 			$fields_separator_default = ' - ';
-		// fields_separator
+			// fields_separator
 			// $fields_separator   = $this->get_fields_separator();
 			switch (true) {
 				case isset($option_obj->divisor):
@@ -120,7 +120,7 @@
 
 		// records_separator_default
 			$records_separator_default = ', ';
-		// records_separator
+			// records_separator
 			// $records_separator   = $this->get_records_separator();
 			switch (true) {
 				case isset($option_obj->records_separator):

diff --git a/core/diffusion/class.diffusion_rdf.php b/core/diffusion/class.diffusion_rdf.php
@@ -691,7 +691,9 @@ public function build_rdf_node($rdf_graph, $node_graph, $ObjectProperty_tipo, $s
 									foreach ($ar_ddo_to_join as $current_ddo_to_join) {
 										$search			= '${'.$current_ddo_to_join->id.'}';
 										$replace_value	= $current_ddo_to_join->value;
-										$text_format	= str_replace($search, $replace_value, $text_format);
+										$text_format	= !empty($text_format)
+											? str_replace($search, $replace_value, $text_format)
+											: $text_format;
 									}
 									// create the ddo
 									$procesed_ddo = new stdClass();
@@ -713,7 +715,9 @@ public function build_rdf_node($rdf_graph, $node_graph, $ObjectProperty_tipo, $s
 											foreach ($ar_ddo_to_join as $current_ddo_to_join) {
 												$search			= '${'.$current_ddo_to_join->id.'}';
 												$replace_value	= $current_ddo_to_join->value ?? ' ';
-												$sentence		= str_replace($search, $replace_value, $sentence);
+												$sentence		= !empty($sentence)
+													? str_replace($search, $replace_value, $sentence)
+													: $sentence;
 											}
 											$ar_parts	= explode(' ? ', $sentence);
 											$ar_parts2	= explode(' : ', $ar_parts[1]);

diff --git a/core/diffusion/class.diffusion_sql.php b/core/diffusion/class.diffusion_sql.php
@@ -1681,7 +1681,7 @@ public function update_record(object $options) : object {
 									. 'current_component_tipo: ' .to_string($current_component_tipo)
 									, logger::WARNING
 								);
-								continue;
+								// continue; // (!) commented 06-11-2023 because MIB Catalog numisdata665 needs to follow external portal numisdata965 Orderer coins
 							}
 
 						// debug_log(__METHOD__." Solving recursive resolve_references on level '$recursion_level' tipo: '$current_component_tipo' model: '$model_name' label: '".RecordObj_dd::get_termino_by_tipo($current_component_tipo)."' ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ", logger::DEBUG);

diff --git a/tools/tool_propagate_component_data/js/render_tool_propagate_component_data.js b/tools/tool_propagate_component_data/js/render_tool_propagate_component_data.js
@@ -9,10 +9,10 @@
 	import {ui} from '../../../core/common/js/ui.js'
 	// import {get_tool_label} from '../../tool_common/js/tool_common.js'
 	// import {pause} from '../../../core/common/js/utils/util.js'
-
 	import {is_filter_empty} from '../../../core/search/js/search.js'
 
 
+
 /**
 * RENDER_TOOL_PROPAGATE_COMPONENT_DATA
 * Manages the component's logic and appearance in client side
@@ -290,6 +290,7 @@ const get_content_data = async function(self) {
 }//end get_content_data
 
 
+
 /**
 * CREATE_RESPONSE
 * Render a response node
@@ -321,10 +322,11 @@ const create_response = function(self, response_text, response, action) {
 	const updated_records_node = ui.create_dom_element({
 		element_type	: 'div',
 		class_name		: 'updated_records',
-		inner_html		:  count_label+ ": " +count + ' ('+action+')',
-		parent 			: response_node
+		inner_html		: count_label+ ": " +count + ' ('+action+')',
+		parent			: response_node
 	})
 
+
 	return response_node
 }// end create_response