facilite l'upgrade

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@319 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/htdocs/admin/geoloc_dynamap.php b/htdocs/admin/geoloc_dynamap.php
index 53dd692..a7feae5 100644 (file)
--- a/htdocs/admin/geoloc_dynamap.php
+++ b/htdocs/admin/geoloc_dynamap.php
@@ -27,6 +27,8 @@ if (Env::get('fix') == 'cities_not_on_map')
     require_once('geoloc.inc.php');
     if (!fix_cities_not_on_map(100))
         $page->trig("Impossible d'accéder au webservice");
+    else
+        $refresh = true;
 }
 
 if (Env::has('new_maps'))
@@ -37,7 +39,11 @@ if (Env::has('new_maps'))
 }
 
 $countMissing = $globals->xdb->query("SELECT COUNT(*) FROM geoloc_city AS c LEFT JOIN geoloc_city_in_maps AS m ON(c.id = m.city_id) WHERE m.city_id IS NULL");
-$page->assign("nb_cities_not_on_map", $countMissing->fetchOneCell());
+$missing = $countMissing->fetchOneCell();
+
+if (isset($refresh) && $missing)
+    header('Refresh: 3');
+$page->assign("nb_cities_not_on_map", $missing);
 
 $page->run();
 

diff --git a/upgrade/0.9.10/02_tels.sql b/upgrade/0.9.10/02_tels.sql
index 6314401..8022145 100644 (file)
--- a/upgrade/0.9.10/02_tels.sql
+++ b/upgrade/0.9.10/02_tels.sql
@@ -10,3 +10,4 @@ CREATE TABLE `tels` (
 INSERT INTO tels SELECT uid, adrid, 0, 'Tél.', tel_pub, tel FROM adresses;
 INSERT INTO tels SELECT uid, adrid, 1, 'Fax', tel_pub, fax FROM adresses;
 DELETE FROM tels WHERE tel = "";
+ALTER TABLE `adresses` DROP `tel`, DROP `tel_pub`;
\ No newline at end of file