wip

ffdnispdb/__init__.py

@@ -23,6 +23,7 @@ def get_locale():
 def create_app(config={}):
     global babel, db, mail, sess
     app = Flask(__name__)
+    app.config["CACHE_TYPE"] = "null"
     app.config.from_object('ffdnispdb.default_settings')
     app.config.from_envvar('FFDNISPDB_SETTINGS', True)
     if isinstance(config, dict):
@@ -54,7 +55,6 @@ def create_app(config={}):
     app.session_interface = sess
     mail.init_app(app)
     cache.init_app(app)
-
     from .views import ispdb
     from .views_api import ispdbapi
     app.register_blueprint(ispdb)
@@ -63,4 +63,3 @@ def create_app(config={}):
 
 
 from . import models
-

ffdnispdb/templates/project_detail.html

@@ -75,6 +75,7 @@
         {%- if project.subscriberCount %}
         {{ field(_("subscribers")) }}
           <dd>{{ project.subscriberCount }}</dd>
+          <dd>{{ project }}</dd>
         {%- endif %}
         {%- if project.chatrooms %}
         {{ field(_("chatrooms")) }}
@@ -87,6 +88,7 @@
           <dd><code style="color: #666;">{{ project.coordinates.latitude }},{{ project.coordinates.longitude }}</code></dd>
         {%- endif %}
       </dl>
+      <p> {{ json }} </p>
     </div>
   </div>
 {%- endblock %}

ffdnispdb/views.py

@@ -22,6 +22,8 @@ from . import db, cache, mail
 from .models import ISP, ISPWhoosh, CoveredArea, RegisteredOffice
 from .crawler import WebValidator, PrettyValidator
 
+from json import dumps
+
 
 ispdb = Blueprint('ispdb', __name__)
 
@@ -67,7 +69,7 @@ def isp_map_data():
         d['popup'] = render_template('map_popup.html', isp=isp)
         data.append(d)
 
-    return Response(json.dumps(data), mimetype='application/json')
+    return Response(dumps(data), mimetype='application/json')
 
 
 # this needs to be cached
@@ -150,7 +152,7 @@ def project(projectid):
     p = ISP.query.filter_by(id=projectid, is_disabled=False).first()
     if not p:
         abort(404)
-    return render_template('project_detail.html', project_row=p, project=p.json)
+    return render_template('project_detail.html', json = json.dumps(p.json), project_row=p, project=p.json)
 
 
 @ispdb.route('/isp/<projectid>/edit', methods=['GET', 'POST'])
@@ -423,15 +425,16 @@ def search():
 
 @ispdb.route('/format', methods=['GET'])
 def format():
+    cache.clear()
     parts = cache.get('format-spec')
     if parts is None:
-        spec = open(ispformat.specs.versions[0.1]).read()
+        spec = open(ispformat.specs.versions[0.2]).read()
         overrides = {
             'initial_header_level': 3,
         }
         parts = docutils.core.publish_parts(
             spec,
-            source_path=os.path.dirname(ispformat.specs.versions[0.1]),
+            source_path=os.path.dirname(ispformat.specs.versions[0.2]),
             destination_path=None, writer_name='html',
             settings_overrides=overrides
         )