itsy-bitsy

borazslo · Mar 28, 2018 · 317ffe5 · 317ffe5
1 parent 205b0bb
commit 317ffe5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/classes/html/church/edit.php b/classes/html/church/edit.php
@@ -16,8 +16,9 @@ public function __construct($path) {
         $this->setTitle($this->church->nev);
 
         if (!$this->church->McheckWriteAccess($user)) {
-            $this->title = 'Hiányzó jogosultság!';
+            $this->title = 'Templom szerkesztése!';
             addMessage('Hiányzó jogosultság!', 'danger');
+            throw new \Exception('Hiányzó jogosultság!');
             return;
         }
 

diff --git a/classes/html/josm.php b/classes/html/josm.php
@@ -10,6 +10,10 @@ public function __construct($path) {
 
         if (isset($_REQUEST['update'])) {
             set_time_limit('300');
+            $cache = new \ExternalApi\OverpassApi();
+            $cache->cache = '1 sec';
+            $cache->clearOldCache();
+
             $job = \Eloquent\Cron::where('class','\ExternalApi\OverpassApi')->where('function','updateUrlMiserend')->first();
             $job->run();                       
         }

diff --git a/templates/josm.twig b/templates/josm.twig
@@ -14,7 +14,6 @@
             <th>url:miserend</th>                
             <th class="col-md-1"><span class="glyphicon glyphicon-edit" aria-hidden="true" style=""></span></th>
             <th class="col-md-1"><span class="glyphicon glyphicon-eye-open" aria-hidden="true" style=""></span></th>
-            <th class="col-md-1"><span class="glyphicon glyphicon-map-marker" aria-hidden="true" style=""></span></th>                
         </tr>
         {% for osm in osmWithoutChurch %}
             <tr>
@@ -50,17 +49,17 @@
     		<th>Ország</th>
                 <th>Város</th>
                 <th>Misézőhely neve </th>
-    		<th class="col-md-1"><span class="glyphicon glyphicon-edit" aria-hidden="true" style=""></span></th>
-                <th class="col-md-1"><span class="glyphicon glyphicon-eye-open" aria-hidden="true" style=""></span></th>
+    		<th class="col-md-1"><span class="glyphicon glyphicon-eye-open" aria-hidden="true" style=""></span></th>
+                <th class="col-md-1"><span class="glyphicon glyphicon-edit" aria-hidden="true" style=""></span></th>                
   		<th class="col-md-1"><span class="glyphicon glyphicon-map-marker" aria-hidden="true" style=""></span></th>                
                 </tr>
          {% for church in churchWithoutOSM %}
              <tr>
                  <td>{{ church.orszag }}</td>
                  <td>{{ church.varos }}</td>
                  <td>{{ church.nev }} {% if church.ismertnev %}({{ church.ismertnev}}){% endif %}</td>
-                 <td><a href="/templom/{{ church.id }}/edit"><span class="glyphicon glyphicon-edit" aria-hidden="true" title="Templom szerkesztése..."></span></a></td>
                  <td><a href="/templom/{{ church.id }}"><span class="glyphicon glyphicon-eye-open" aria-hidden="true" title="Templom megtekintése..."></span></a></td>                 
+                 <td><a href="https://www.openstreetmap.org/edit?editor=id#map=19/{{ church.lat }}/{{ church.lon }}"><span class="glyphicon glyphicon-edit" aria-hidden="true" title="OSM szerkesztése..."></span></a></td>                 
                  <td><a href='http://www.openstreetmap.org/?mlat={{ church.lat }}&mlon={{ church.lon }}#map=18/{{ church.lat }}/{{ church.lon }}' target='_blank'><span class="glyphicon glyphicon glyphicon-map-marker" aria-hidden="true" title="OSM térkép megjelenítése..."></span></a></td>
              </tr>
         {% endfor %}