CDPP / AMDA_Integration

Commit d2a2763f4d68af204163ad5a08d25fd451ba2ace

Authored by Benjamin Renard
1 parent 97d1c981
Exists in master and in 63 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, 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, ws_get_catalog

Fix test used to know if a templated parameter must be regenerated or not

Showing 1 changed file with 2 additions and 3 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Tools/IHMParamTemplateClass.php
  Diff comments   View file @d2a2763
... ... @@ -161,8 +161,7 @@ class IHMParamTemplateClass
161 161 if (file_exists($dstFilePath)) {
162 162 $dateModifDst = filemtime($dstFilePath);
163 163 $dateModifTemplate = filemtime($templatePath);
164   -
165   - if ($dateModifTemplate != $dateModifDst)
  164 + if ($dateModifTemplate == $dateModifDst)
166 165 //no modification - reuse old generated file
167 166 return $dstFilePath;
168 167 }
... ... @@ -274,7 +273,7 @@ class IHMParamTemplateClass
274 273 return;
275 274 foreach ($arguments as $arg_key => $arg_def) {
276 275 if (!array_key_exists($arg_key, $template_args))
277   - $template_args[$arg_key] = $arg_def->default;
  276 + $template_args[$arg_key] = $arg_def['default'];
278 277 }
279 278 }
280 279  
... ...