Json is now loaded with Ajax.

[philipp/winterrodeln/wradmin.git] / wradmin / controllers / rodelbahn.py

diff --git a/wradmin/controllers/rodelbahn.py b/wradmin/controllers/rodelbahn.py
index 345cbc113e27d9ec679d8c4a47b556dcae57a6fd..a4c2a6404a0e99ac98b3276921ee42e2ced594cb 100644 (file)
--- a/wradmin/controllers/rodelbahn.py
+++ b/wradmin/controllers/rodelbahn.py
@@ -1,11 +1,12 @@
-from flask import request, abort, redirect, url_for, flash, render_template
+from urllib.parse import quote_plus
+

 import paginate
 import sqlalchemy as sa
 import paginate
 import sqlalchemy as sa

+from flask import request, abort, redirect, url_for, flash, render_template, current_app

 
 

-import wrpylib.wrmwmarkup
-import wrpylib.wrmwcache

 import wrpylib.mwmarkup
 import wrpylib.mwmarkup

-
+import wrpylib.wrmwcache
+import wrpylib.wrmwmarkup

 from wradmin.app import db
 from wradmin.model import WrSledrunCache, WrReport
 from wradmin.template_helper import PylonsHelper
 from wradmin.app import db
 from wradmin.model import WrSledrunCache, WrReport
 from wradmin.template_helper import PylonsHelper


@@ -40,12 +41,10 @@ class RodelbahnController:
         sledrun = q.get(sledrun_id)
         if sledrun is None:
             abort(404)
         sledrun = q.get(sledrun_id)
         if sledrun is None:
             abort(404)

-        h = PylonsHelper()
-        return render_template('json_editor.html',
-                               schema_url=url_for('static', filename='schema_v1.json'),
-                               #json_url=url_for('static', filename='latschenhuette.json')
-                               json_url=h.wiki(sledrun.page_title)
-                               )
+        mediawiki_index = f'{current_app.config["MEDIAWIKI_ROOT"]}/index.php'
+        schema_url = f'{mediawiki_index}?title=Winterrodeln:Datenschema/Rodelbahn/V1.json&action=raw'
+        json_url = f'{mediawiki_index}?title={quote_plus(sledrun.page_title)}/Rodelbahn.json&action=raw'
+        return render_template('json_editor.html', schema_url=schema_url, json_url=json_url)

 
     def update(self):
         """Updates the wrsledruncache table from the wiki"""
 
     def update(self):
         """Updates the wrsledruncache table from the wiki"""