changes from desktop computer

eventplanner_gcal/google_sync.py

@@ -5,6 +5,7 @@ import time
 
 from eventplanner.models import Event, EventParticipation
 from eventplanner_gcal.models import GCalMapping, GCalPushChannel, UserGCalCoupling
+# noinspection PyUnresolvedReferences,PyUnresolvedReferences
 from apiclient.http import BatchHttpRequest
 from builtins import str as text  # python2 and python3
 from django.conf import settings
@@ -17,6 +18,7 @@ logger = logging.getLogger(__name__)
 def create_gcal_service_object():
     """Creates a Google API service object. This object is required whenever a Google API call is made"""
     from oauth2client.file import Storage
+    # noinspection PyUnresolvedReferences
     from apiclient.discovery import build
 
     gcal_settings = settings.GCAL_COUPLING

eventplanner_gcal/management/commands/gcal_sync.py

@@ -1,5 +1,4 @@
 from django.core.management.base import NoArgsCommand
-
 from eventplanner_gcal.google_sync import sync_from_local_to_google
 
 

eventplanner_gcal/signals.py

@@ -5,6 +5,7 @@ from eventplanner_gcal.google_sync import get_service_object, \
     create_gcal_event, delete_gcal_event, update_gcal_event, on_gcal_event_created
 
 import logging
+from django.conf import settings
 
 logger = logging.getLogger(__name__)
 
@@ -17,6 +18,9 @@ logger = logging.getLogger(__name__)
 
 @receiver(post_save, sender=Event)
 def event_post_save_handler(**kwargs):
+    if not settings.GCAL_SYNC_ENABLED:
+        return
+
     event = kwargs['instance']
     created = kwargs['created']
     try:
@@ -33,9 +37,12 @@ def event_post_save_handler(**kwargs):
 
 @receiver(pre_delete, sender=Event)
 def event_pre_delete_handler(**kwargs):
+    if not settings.GCAL_SYNC_ENABLED:
+        return
+
     try:
         event = kwargs['instance']
-        logger.info("Deleting GCAL event")
+        logger.info("Deleting Gcal event")
         delete_gcal_event(get_service_object(), event).execute()
     except Exception as e:
         logger.error("Error deleting GCAL event" + str(e))
@@ -43,6 +50,9 @@ def event_pre_delete_handler(**kwargs):
 
 @receiver(post_save, sender=EventParticipation)
 def participation_post_save_handler(**kwargs):
+    if not settings.GCAL_SYNC_ENABLED:
+        return
+
     try:
         participation = kwargs['instance']
         logger.info("Participation post save -> update gcal")

eventplanner_gcal/templates/eventplanner_gcal/management.html

@@ -4,7 +4,7 @@
 {% block content %}
 
     {% addtoblock "css" strip  %}
-        <link rel="stylesheet" href="{{STATIC_URL}}/css/bootstrap-switch.min.css" type="text/css" media="screen" />
+        <link rel="stylesheet" href="{{STATIC_URL}}css/bootstrap-switch.min.css" type="text/css" media="screen" />
     {% endaddtoblock %}
 
     {% addtoblock "css" %}
@@ -25,7 +25,7 @@
     {% endaddtoblock %}
 
     {% addtoblock "js" strip %}
-        <script src="{{STATIC_URL}}/js/bootstrap-switch.min.js"></script>
+        <script src="{{STATIC_URL}}js/bootstrap-switch.min.js"></script>
     {% endaddtoblock %}
 
     {% addtoblock "js" %}
@@ -72,7 +72,7 @@
                     weil man alle anderen eigenen Termine auch im Blick hat.
                 </p>
 
-                 <img src="{{STATIC_URL}}/img/screenshot.png">
+                 <img src="{{STATIC_URL}}img/screenshot.png">
 
                 <p>
                     <h5>SO GEHTS:</h5>
@@ -115,7 +115,7 @@
             </div>
 
             <div class="span3 offset1">
-                <img src="{{STATIC_URL}}/img/google_cal.png">
+                <img src="{{STATIC_URL}}img/google_cal.png">
 
             </div>