chg: [internal] Allow to have empty nationality

Author: JakubOnderka

app/Controller/OrganisationsController.php

@@ -159,7 +159,8 @@ public function admin_add()
                 }
             }
         }
-        $this->set('countries', $this->_arrayToValuesIndexArray($this->Organisation->getCountries()));
+        $countries = array_merge(['' => __('Not specified')], $this->_arrayToValuesIndexArray($this->Organisation->getCountries()));
+        $this->set('countries', $countries);
     }
 
     public function admin_edit($id)
@@ -238,7 +239,7 @@ public function admin_edit($id)
             $this->request->data = $this->Organisation->data;
         }
 
-        $countries = $this->_arrayToValuesIndexArray($this->Organisation->getCountries());
+        $countries = array_merge(['' => __('Not specified')], $this->_arrayToValuesIndexArray($this->Organisation->getCountries()));
         if (!empty($this->Organisation->data['Organisation']['nationality'])) {
             $currentCountry = $this->Organisation->data['Organisation']['nationality'];
             if (!isset($countries[$currentCountry])) {

app/Model/Organisation.php

@@ -104,7 +104,7 @@ public function beforeValidate($options = array())
         }
         $this->data['Organisation']['date_modified'] = $date;
         if (!isset($this->data['Organisation']['nationality']) || empty($this->data['Organisation']['nationality'])) {
-            $this->data['Organisation']['nationality'] = 'Not specified';
+            $this->data['Organisation']['nationality'] = '';
         }
         return true;
     }