Browse Source

Newsletter nur 1x

Juan Carlos 3 years ago
parent
commit
45620db498

+ 5 - 27
marktplatz/signals.py

@@ -16,41 +16,19 @@ from marktplatz.models import *
 
 
 
 
 @receiver(post_save, sender=Product)
 @receiver(post_save, sender=Product)
-@receiver(post_save, sender=Wohnprojekt)
+# @receiver(post_save, sender=MobilitaetsProjekt)
+# @receiver(post_save, sender=ErnaehrungsProjekt)
+# @receiver(post_save, sender=EnergyProjekt)
+# @receiver(post_save, sender=Wohnprojekt)
 def search_agent(sender, instance, update_fields=None, **kwargs):
 def search_agent(sender, instance, update_fields=None, **kwargs):
     # print("signal called")
     # print("signal called")
     # if update_fields is not None:
     # if update_fields is not None:
     #     if 'frei' in update_fields:
     #     if 'frei' in update_fields:
     if instance.frei == 'JAJA' and instance.public == True :
     if instance.frei == 'JAJA' and instance.public == True :
 
 
+        # SAVE an object that will trigger the search loop later.
         trigger = Trigger(ort=instance.ort, instancepk = instance.pk  )
         trigger = Trigger(ort=instance.ort, instancepk = instance.pk  )
         trigger.save()
         trigger.save()
-        # SAVE an object that will trigger the search loop later.
-
-        # for agent in SearchAgent.objects.all():
-        #
-        #     for agentOrt in agent.ort:
-        #         if agentOrt == instance.ort:
-        #             context = {}
-        #             context['product'] = model_to_dict ( instance )
-        #             context['agent']   = model_to_dict ( agent )
-        #
-        #             context['product']['status']  =  instance.get_status_display()
-        #             context['product']['ort']     =  instance.get_ort_display()
-        #             context['agent']['delete_url']= 'https://' + config.WEBSEITE_URI + reverse(  'search-agent-delete' , kwargs={ 'pk': agent.pk, 'hash': agent.hash }   )
-        #
-        #             context['recipient'] = [ agent.email, ]
-        #             context['msg_subject' ] = ('Gemeinschaffen - ' + instance.name )
-        #
-        #             mail.send(
-        #                 context['recipient'],
-        #                 config.EMAIL_NOREPLY,
-        #                 context = context,
-        #                 template='generic',
-        #                 headers={  'Reply-To': instance.email },
-        #                 priority='medium',
-        #             )
-
 
 
 
 
 def process_triggers():
 def process_triggers():

+ 3 - 3
marktplatz/templates/marktplatz/product_overview.html

@@ -434,14 +434,14 @@ $(document).ready(function(){
             			<p>{{ product.artmodell }}</p>
             			<p>{{ product.artmodell }}</p>
             			<p>{% if product.orga  %}<strong>{% field_name product 'orga' %}</strong>: {{ product.orga }}{% endif %}</p>
             			<p>{% if product.orga  %}<strong>{% field_name product 'orga' %}</strong>: {{ product.orga }}{% endif %}</p>
             			<!-- XXX -->
             			<!-- XXX -->
-            			<p>{% if product.eigentum  %}<strong>{% field_name object 'eigentum' %}</strong>: {{ product.get_eigentum_display }}{% endif %}</p>
+            			<p>{% if product.eigentum  %}<strong>{% field_name product 'eigentum' %}</strong>: {{ product.get_eigentum_display }}{% endif %}</p>
             			<!-- XXX -->
             			<!-- XXX -->
             			<p>{% if product.gprojekte  %}<strong>Gemeinschaftliche Projekte</strong>: {{ product.gprojekte }}{% endif %}</p>
             			<p>{% if product.gprojekte  %}<strong>Gemeinschaftliche Projekte</strong>: {{ product.gprojekte }}{% endif %}</p>
 
 
             			<p>{% if product.zielgruppen  %}<strong>Besondere Zielgruppen</strong>: {{ product.zielgruppen }}{% endif %}</p>
             			<p>{% if product.zielgruppen  %}<strong>Besondere Zielgruppen</strong>: {{ product.zielgruppen }}{% endif %}</p>
             			<p>{% if product.freiraumangebote  %}<strong>Freiraumangebote</strong>: {{ product.freiraumangebote }}{% endif %}</p>
             			<p>{% if product.freiraumangebote  %}<strong>Freiraumangebote</strong>: {{ product.freiraumangebote }}{% endif %}</p>
-            			<p>{% if product.oekologie  %}<strong>{% field_name object 'oekologie' %}</strong>: {{ product.oekologie }}{% endif %}</p>
-            			<p>{% if product.schwerpunkt  %}<strong>{% field_name object 'schwerpunkt' %}</strong>: {{ product.schwerpunkt }}{% endif %}</p>
+            			<p>{% if product.oekologie  %}<strong>{% field_name product 'oekologie' %}</strong>: {{ product.oekologie }}{% endif %}</p>
+            			<p>{% if product.schwerpunkt  %}<strong>{% field_name product 'schwerpunkt' %}</strong>: {{ product.schwerpunkt }}{% endif %}</p>
 
 
                   <!-- <div class="" style=""><span>{{ product.beschreibung | safe }}</span></div>
                   <!-- <div class="" style=""><span>{{ product.beschreibung | safe }}</span></div>
                   <div class="" style=""><strong>Wohnungen:</strong> <span>{{ product.awohnungen }}</span></div>
                   <div class="" style=""><strong>Wohnungen:</strong> <span>{{ product.awohnungen }}</span></div>

+ 1 - 1
project_base/templates/newsletter/subscription_subscribe_onlyns.html

@@ -6,7 +6,7 @@
 {% block title %}{% trans "Newsletter Anmeldung" %}{% endblock title %}
 {% block title %}{% trans "Newsletter Anmeldung" %}{% endblock title %}
 
 
 {% block body %}
 {% block body %}
-    <h1>{% trans "Newsletter Anmeldung" %} {{ newsletter.title }}</h1>
+    <h1>{% trans "Anmeldung" %} {{ newsletter.title }}</h1>
 
 
     {% if error %}
     {% if error %}
         <p>{% trans "Due to a technical error we were not able to submit your confirmation email. This could be because your email address is invalid." %}</p>
         <p>{% trans "Due to a technical error we were not able to submit your confirmation email. This could be because your email address is invalid." %}</p>