CDPP / AMDA_IHM

Commit a2b8ec195faf29b76983d6df41327e8923c4c509

Authored by Benjamin Renard
1 parent 1c1417db
Exists in master and in 22 other branches FER_10828_2, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_6265, FER_6951, FER_7862, FER_9629, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_11362, MAZ_11427, SpeasyGet, amdadev, amdadev_test, openam

Fix userDefaults.json creation

Showing 1 changed file with 7 additions and 7 deletions   Show diff stats
Inline Side-by-side
php/classes/AmdaAction.php
  Diff comments   View file @a2b8ec1
... ... @@ -1762,17 +1762,17 @@ class AmdaAction
1762 1762 $childrenToReturn = array();
1763 1763 $children = [];
1764 1764 if (!file_exists(DATAPATH.'defaultValues.json'))
1765   - return array('success' => false , 'defaultValues' => array(), 'message'=>'efaultvalues file not found.');
  1765 + return array('success' => false , 'defaultValues' => array(), 'message'=>'Defaultvalues file not found.');
1766 1766 $json_o = json_decode(file_get_contents(DATAPATH.'defaultValues.json'), true);
1767 1767 if (empty($json_o))
1768 1768 return array('success' => false , 'defaultValues' => array(), 'message'=>'Error : defaultValues file empty.');
1769 1769  
1770   - if (!file_exists(USERDIR.'userDefaults.json'))
1771   - return array('success' => true , 'defaultValues' => $json_o, 'message'=>'No modification on defaultvalues.');
1772   -
1773   - $json_user = json_decode(file_get_contents(USERDIR.'userDefaults.json'), true);
1774   - if (empty($json_user))
1775   - return array('success' => true , 'defaultValues' => $json_o, 'message'=>'No modification on defaultvalues.');
  1770 + $json_user = array();
  1771 + if (file_exists(USERDIR.'userDefaults.json'))
  1772 + $json_user = json_decode(file_get_contents(USERDIR.'userDefaults.json'), true);
  1773 + if (empty($json_user)) {
  1774 + $json_user = array();
  1775 + }
1776 1776  
1777 1777 foreach($json_user as $key => $value){
1778 1778 $keys = explode(".", $key);
... ...