From a7f0717869ab3f7a2202d2ac24e28b42b1e5b348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= <laura@codingcatgirl.de>
Date: Mon, 26 Nov 2018 01:18:42 +0100
Subject: [PATCH] use mobileclient.set_user_data() whenever needed/possible

---
 src/c3nav/control/templates/control/base.html   | 13 +++++++++++++
 src/c3nav/editor/static/editor/js/editor.js     | 17 ++++++++++++++++-
 src/c3nav/editor/templates/editor/base.html     |  4 ++--
 .../editor/fragment_mobileclientdata.html       |  1 +
 src/c3nav/editor/views/base.py                  |  2 ++
 src/c3nav/settings.py                           |  2 +-
 src/c3nav/site/context_processors.py            |  6 ------
 src/c3nav/site/middleware.py                    | 10 ++++++++++
 src/c3nav/site/static/site/js/c3nav.js          |  9 +++++++--
 src/c3nav/site/templates/site/base.html         |  4 ++--
 10 files changed, 54 insertions(+), 14 deletions(-)
 create mode 100644 src/c3nav/editor/templates/editor/fragment_mobileclientdata.html
 create mode 100644 src/c3nav/site/middleware.py

diff --git a/src/c3nav/control/templates/control/base.html b/src/c3nav/control/templates/control/base.html
index 3b3c9666..82e74aaa 100644
--- a/src/c3nav/control/templates/control/base.html
+++ b/src/c3nav/control/templates/control/base.html
@@ -1,5 +1,7 @@
 {% extends 'site/base.html' %}
 {% load i18n %}
+{% load compress %}
+{% load static %}
 
 {% block title %}{% trans 'c3nav control panel' %}{% endblock %}
 {% block header_title %}<span id="subheader">{% trans 'control panel' %}</span>{% endblock %}
@@ -27,4 +29,15 @@
     {% block subcontent %}
     {% endblock %}
 </main>
+    {% compress js %}
+        <script type="text/javascript" src="{% static 'jquery/jquery.js' %}"></script>
+        <script type="text/javascript">
+        if (window.mobileclient) {
+            var $body = $('body');
+            if ($body.is('[data-user-data]')) {
+                mobileclient.set_user_data(JSON.parse($body.attr('data-user-data')));
+            }
+        }
+        </script>
+    {% endcompress %}
 {% endblock %}
diff --git a/src/c3nav/editor/static/editor/js/editor.js b/src/c3nav/editor/static/editor/js/editor.js
index 22ef810e..73a0ce7f 100644
--- a/src/c3nav/editor/static/editor/js/editor.js
+++ b/src/c3nav/editor/static/editor/js/editor.js
@@ -22,7 +22,13 @@ editor = {
             editor.map.doubleClickZoom.enable();
         });
 
-        if (window.mobileclient) $('body').addClass('mobileclient');
+        if (window.mobileclient) {
+            var $body = $('body');
+            $body.addClass('mobileclient');
+            if ($body.is('[data-user-data]')) {
+                editor._inform_mobile_client($body);
+            }
+        }
 
         /*
          * Fix scroll wheel zoom on precise scrolling devices
@@ -57,6 +63,13 @@ editor = {
         editor.init_geometries();
         editor.init_wificollector();
     },
+    _inform_mobile_client: function(elem) {
+        if (!window.mobileclient || !elem.length) return;
+        var data = JSON.parse(elem.attr('data-user-data'));
+        data.changes_count_display = elem.attr('data-count-display');
+        data.direct_editing = elem.is('[data-direct-editing]');
+        mobileclient.set_user_data(data);
+    },
     _onbeforeunload: function(e) {
         if ($('#sidebar').find('[data-onbeforeunload]').length) {
             e.returnValue = true;
@@ -161,6 +174,8 @@ editor = {
             $('#navbar-collapse').find('.nav').html(nav.html());
         }
 
+        editor._inform_mobile_client(content.find('[data-user-data]'));
+
         var group;
         if (content.find('[name=fixed_x]').length) {
             $('[name=name]').change(editor._source_name_selected).change();
diff --git a/src/c3nav/editor/templates/editor/base.html b/src/c3nav/editor/templates/editor/base.html
index a1ddb561..4f4fca5b 100644
--- a/src/c3nav/editor/templates/editor/base.html
+++ b/src/c3nav/editor/templates/editor/base.html
@@ -17,9 +17,9 @@
         <link href="{% static 'editor/css/editor.scss' %}" rel="stylesheet" type="text/x-scss">
     {% endcompress %}
   </head>
-  <body{% if mobileclient %} data-user-data="{{ user_data_json }}" data-count-display="{{ request.changeset.count_display }}"{% if request.changeset.direct_editing%} data-direct-editing{% endif %}{% endif %}>
+  <body{% if request.mobileclient %} data-user-data="{{ user_data_json }}" data-count-display="{{ request.changeset.count_display }}"{% if request.changeset.direct_editing%} data-direct-editing{% endif %}{% endif %}>
 
-    {% if not mobileclient %}
+    {% if not request.mobileclient %}
     <nav class="navbar navbar-static-top navbar-default">
         <div class="container-fluid">
             <div class="navbar-header">
diff --git a/src/c3nav/editor/templates/editor/fragment_mobileclientdata.html b/src/c3nav/editor/templates/editor/fragment_mobileclientdata.html
new file mode 100644
index 00000000..975ff536
--- /dev/null
+++ b/src/c3nav/editor/templates/editor/fragment_mobileclientdata.html
@@ -0,0 +1 @@
+<div data-user-data="{{ user_data_json }}" data-count-display="{{ request.changeset.count_display }}"{% if request.changeset.direct_editing%} data-direct-editing{% endif %}></div>
diff --git a/src/c3nav/editor/views/base.py b/src/c3nav/editor/views/base.py
index 36f2d72f..61974e78 100644
--- a/src/c3nav/editor/views/base.py
+++ b/src/c3nav/editor/views/base.py
@@ -56,6 +56,8 @@ def sidebar_view(func=None, select_related=None, api_hybrid=False):
                 return render(request, 'editor/redirect.html', {'target': response['location']})
             if not isinstance(response, HttpResponseNotModified):
                 response.write(render(request, 'editor/fragment_nav.html', {}).content)
+                if request.mobileclient:
+                    response.write(render(request, 'editor/fragment_mobileclientdata.html', {}).content)
             response['Cache-Control'] = 'no-cache'
             patch_vary_headers(response, ('X-Requested-With', ))
             return response
diff --git a/src/c3nav/settings.py b/src/c3nav/settings.py
index da6ee438..59ef9e48 100644
--- a/src/c3nav/settings.py
+++ b/src/c3nav/settings.py
@@ -225,6 +225,7 @@ MIDDLEWARE = [
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'c3nav.mapdata.middleware.UserDataMiddleware',
+    'c3nav.site.middleware.MobileclientMiddleware',
     'c3nav.control.middleware.UserPermissionsMiddleware',
     'c3nav.api.middleware.JsonRequestBodyMiddleware',
 ]
@@ -297,7 +298,6 @@ TEMPLATES = [
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
                 'c3nav.site.context_processors.logos',
-                'c3nav.site.context_processors.mobileclient',
                 'c3nav.site.context_processors.user_data_json',
             ],
             'loaders': template_loaders
diff --git a/src/c3nav/site/context_processors.py b/src/c3nav/site/context_processors.py
index fee7a19b..4094f695 100644
--- a/src/c3nav/site/context_processors.py
+++ b/src/c3nav/site/context_processors.py
@@ -15,12 +15,6 @@ def logos(request):
     return logos_result
 
 
-def mobileclient(request):
-    return {
-        'mobileclient': 'c3navclient' in request.META['HTTP_USER_AGENT'],
-    }
-
-
 def user_data_json(request):
     return {
         'user_data_json': lambda: json.dumps(dict(request.user_data), separators=(',', ':'), cls=DjangoJSONEncoder),
diff --git a/src/c3nav/site/middleware.py b/src/c3nav/site/middleware.py
new file mode 100644
index 00000000..0d09d909
--- /dev/null
+++ b/src/c3nav/site/middleware.py
@@ -0,0 +1,10 @@
+class MobileclientMiddleware:
+    """
+    This middleware adds request.mobileclient
+    """
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        request.mobileclient = 'c3navclient' in request.META['HTTP_USER_AGENT']
+        return self.get_response(request)
diff --git a/src/c3nav/site/static/site/js/c3nav.js b/src/c3nav/site/static/site/js/c3nav.js
index 04da54bd..b4c59430 100644
--- a/src/c3nav/site/static/site/js/c3nav.js
+++ b/src/c3nav/site/static/site/js/c3nav.js
@@ -43,9 +43,13 @@ c3nav = {
         });
 
         if (window.mobileclient) {
+            var $body = $('body');
             $('#attributions').find('a:not([href^="http"]):not([href^="//"])').removeAttr('target');
-            $('body').addClass('mobileclient');
+            $body.addClass('mobileclient');
             c3nav._set_user_location(null);
+            if ($body.is('[data-user-data]')) {
+                mobileclient.set_user_data(JSON.parse($body.attr('data-user-data')));
+            }
         }
     },
     load_searchable_locations: function() {
@@ -1233,7 +1237,7 @@ c3nav = {
             c3nav.last_site_update = data.last_site_update;
             c3nav._maybe_load_site_update(c3nav.state);
         }
-        c3nav._set_user_data(data.user);
+        c3nav._set_user_data_set_user_data(data.user);
     },
     _maybe_load_site_update: function(state) {
         if (c3nav.new_site_update && !state.modal && (!state.routing || !state.origin || !state.destination)) {
@@ -1252,6 +1256,7 @@ c3nav = {
         var $user = $('header #user');
         $user.find('span').text(data.title);
         $user.find('small').text(data.subtitle || '');
+        if (window.mobileclient) mobileclient.set_user_data(data);
     },
 
     _last_wifi_scant: 0,
diff --git a/src/c3nav/site/templates/site/base.html b/src/c3nav/site/templates/site/base.html
index b6091fc4..99685918 100644
--- a/src/c3nav/site/templates/site/base.html
+++ b/src/c3nav/site/templates/site/base.html
@@ -18,8 +18,8 @@
         <link href="{% static 'site/css/c3nav.scss' %}" rel="stylesheet" type="text/x-scss">
     {% endcompress %}
 </head>
-<body{% if mobileclient %} data-user-data="{{ user_data_json }}"{% endif %}>
-    {% if not embed and not mobileclient %}
+<body{% if request.mobileclient %} data-user-data="{{ user_data_json }}"{% endif %}>
+    {% if not embed and not request.mobileclient %}
         <header>
             <h1><a href="{% block header_title_url %}/{% endblock %}">
                 {% if header_logo %}<img src="{% static header_logo %}">{% else %}c3nav {% endif %}{% spaceless %}