CDPP / AMDA_Integration

Commit 7d35612acfe62da5b9de6dae15b66cd14780c321

Authored by Benjamin Renard
1 parent 7911f4bc
Exists in master and in 66 other branches 10098, 4797, 5390, 6728, 7616, 8528, 8928, 9016Bis, 9049, 9084, 9259, 9326, FER_10400, FER_10663, FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_8455, FER_9629, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akka-scatter-multi-xparams, amdadev, anr_tempete, cu2022, density_maps, develop, evol-6371, expression-parser-bre, frames-transformation, install-rework, livraison-akka, master_vge, mlplasmas, multiplot, new-save-plot-request, plot-request, plot-tt-catalog, rm_5357, rm_6595, rm_6912, rm_7926, rm_8932, save-other-requests, shared-objects-updater, sum-components-indexes, test-merge, webservice, ws_get_catalog

Fix ParamManager for T96

Showing 2 changed files with 4 additions and 1 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Tools/IHMParamManagerClass.php
  Diff comments   View file @7d35612
@@ -161,6 +161,9 @@ class IHMParamManagerClass @@ -161,6 +161,9 @@ class IHMParamManagerClass
161 if ($template_id !== FALSE) { 161 if ($template_id !== FALSE) {
162 $linkedParamId = $template_id; 162 $linkedParamId = $template_id;
163 } 163 }
  164 + else {
  165 + $linkedParamId = $this->templateParamsManager->replaceArgs($linkedParamId, $templateArgs);
  166 + }
164 167
165 if ($this->templateParamsManager->isTemplatedParam($linkedParamId)) { 168 if ($this->templateParamsManager->isTemplatedParam($linkedParamId)) {
166 $linkedParamPath = $this->templateParamsManager->generateTemplatedParamFile($linkedParamId, $templateArgs); 169 $linkedParamPath = $this->templateParamsManager->generateTemplatedParamFile($linkedParamId, $templateArgs);
src/InputOutput/IHMImpl/Tools/IHMParamTemplateClass.php
  Diff comments   View file @7d35612
@@ -218,7 +218,7 @@ class IHMParamTemplateClass @@ -218,7 +218,7 @@ class IHMParamTemplateClass
218 /* 218 /*
219 * @brief Replace args in string 219 * @brief Replace args in string
220 */ 220 */
221 - private function replaceArgs($string, $template_args) { 221 + public function replaceArgs($string, $template_args) {
222 $result = $string; 222 $result = $string;
223 foreach ($template_args as $template_arg_key => $template_arg_value) { 223 foreach ($template_args as $template_arg_key => $template_arg_value) {
224 $result = str_replace("##".$template_arg_key."##", $template_arg_value, $result); 224 $result = str_replace("##".$template_arg_key."##", $template_arg_value, $result);