X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fdirenum.php;h=bbb2869d3f958d056b3409bbb664013eedcdaba6;hb=81120a6fae8573d4d333ab9009f57efa81b55c7e;hp=5350f0e815284442104bbfa8cf80b3b9375230ac;hpb=b47cc6f09f0a001d1f00f4263d3b14b4eb4ce379;p=platal.git

diff --git a/classes/direnum.php b/classes/direnum.php
index 5350f0e..bbb2869 100644
--- a/classes/direnum.php
+++ b/classes/direnum.php
@@ -46,6 +46,7 @@ class DirEnum
     const NATIONALITIES  = 'nationalities';
     const COUNTRIES      = 'countries';
     const ADMINAREAS     = 'adminareas';
+    const SUBADMINAREAS  = 'subadminareas';
     const LOCALITIES     = 'localities';
 
     const COMPANIES      = 'companies';
@@ -578,8 +579,8 @@ class DE_Nationalities extends DirEnumeration
 class DE_Countries extends DirEnumeration
 {
     protected $idfield   = 'geoloc_countries.iso_3166_1_a2';
-    protected $valfield  = 'geoloc_countries.countryFR';
-    protected $valfield2 = 'geoloc_countries.country';
+    protected $valfield  = 'geoloc_countries.country';
+    protected $valfield2 = 'geoloc_countries.countryEn';
     protected $from      = 'geoloc_countries';
 
     protected $ac_join   = 'INNER JOIN profile_addresses ON (geoloc_countries.iso_3166_1_a2 = profile_addresses.countryId)';
@@ -600,6 +601,19 @@ class DE_AdminAreas extends DE_WithSuboption
 }
 // }}}
 
+// {{{ class DE_SubAdminAreas
+class DE_SubAdminAreas extends DE_WithSuboption
+{
+    protected $idfield   = 'geoloc_subadministrativeareas.id';
+    protected $optfield  = 'geoloc_subadministrativeareas.administrativearea';
+    protected $valfield  = 'geoloc_subadministrativeareas.name';
+    protected $from      = 'geoloc_subadministrativeareas';
+
+    protected $ac_join   = 'INNER JOIN profile_addresses ON (profile_addresses.subadministrativeAreaId = geoloc_subadministrativeareas.id)';
+    protected $ac_unique = 'profile_addresses.pid';
+}
+// }}}
+
 // {{{ class DE_Localities
 class DE_Localities extends DirEnumeration
 {