udata 7.0.4.dev27568__py2.py3-none-any.whl → 7.0.4.dev27593__py2.py3-none-any.whl

udata/core/discussions/api.py

@@ -14,10 +14,8 @@ from udata.core.user.api_fields import user_ref_fields
 from .forms import DiscussionCreateForm, DiscussionCommentForm
 from .models import Message, Discussion
 from .permissions import CloseDiscussionPermission
-from .signals import (
-    on_new_discussion, on_new_discussion_comment, on_discussion_closed,
-    on_discussion_deleted
-)
+from .signals import on_discussion_deleted
+
 
 ns = api.namespace('discussions', 'Discussion related operations')
 

udata/core/discussions/tasks.py

@@ -16,8 +16,10 @@ log = get_logger(__name__)
 def owner_recipients(discussion):
     if getattr(discussion.subject, 'organization', None):
         return [m.user for m in discussion.subject.organization.members]
-    else:
+    elif getattr(discussion.subject, 'owner', None):
         return [discussion.subject.owner]
+    else:
+        return []
 
 
 @connect(on_new_discussion, by_id=True)

udata/harvest/backends/base.py

@@ -156,7 +156,7 @@ class BaseBackend(object):
             self.job.errors.append(error)
             self.job.status = 'failed'
             self.end()
-            return
+            return None
         except Exception as e:
             self.job.status = 'failed'
             error = HarvestError(message=safe_unicode(e))
@@ -164,7 +164,7 @@ class BaseBackend(object):
             self.end()
             msg = 'Initialization failed for "{0.name}" ({0.backend})'
             log.exception(msg.format(self.source))
-            return
+            return None
 
         if self.max_items:
             self.job.items = self.job.items[:self.max_items]

udata/harvest/models.py

@@ -94,7 +94,7 @@ class HarvestSource(db.Owned, db.Document):
                         populate_from='name', update=True)
     description = db.StringField()
     url = db.StringField(required=True)
-    backend = db.StringField()
+    backend = db.StringField(required=True)
     config = db.DictField()
     periodic_task = db.ReferenceField('PeriodicTask',
                                       reverse_delete_rule=db.NULLIFY)

udata/harvest/tasks.py

@@ -19,15 +19,18 @@ def harvest(self, ident):
     Backend = backends.get(current_app, source.backend)
     backend = Backend(source)
     items = backend.perform_initialization()
-    if items > 0:
+    if items is None:
+        pass
+    elif items == 0:
+        backend.finalize()
+    else:
         finalize = harvest_job_finalize.s(backend.job.id)
         items = [
             harvest_job_item.s(backend.job.id, item.remote_id)
             for item in backend.job.items
         ]
         chord(items)(finalize)
-    elif items == 0:
-        backend.finalize()
+    
 
 
 @task(ignore_result=False, route='low.harvest')

udata/harvest/tests/factories.py

@@ -22,6 +22,7 @@ class HarvestSourceFactory(ModelFactory):
     name = factory.Faker('name')
     url = factory.Faker('url')
     description = factory.Faker('text')
+    backend = 'factory'
 
 
 class HarvestJobFactory(ModelFactory):

udata/harvest/tests/test_models.py

@@ -12,7 +12,7 @@ log = logging.getLogger(__name__)
 @pytest.mark.usefixtures('clean_db')
 class HarvestSourceTest:
     def test_defaults(self):
-        source = HarvestSource.objects.create(name='Test', url=faker.url())
+        source = HarvestSource.objects.create(name='Test', url=faker.url(), backend='factory')
         assert source.name == 'Test'
         assert source.slug == 'test'
 

udata/settings.py

@@ -470,8 +470,7 @@ class Testing(object):
     WTF_CSRF_ENABLED = False
     AUTO_INDEX = False
     CELERY_TASK_ALWAYS_EAGER = True
-    # TODO: ideally, this should be set to True in order to reveal exceptions in delayed tasks
-    CELERY_TASK_EAGER_PROPAGATES = False
+    CELERY_TASK_EAGER_PROPAGATES = True
     TEST_WITH_PLUGINS = False
     PLUGINS = []
     TEST_WITH_THEME = False

udata/templates/mail/membership_refused.html

@@ -7,7 +7,7 @@
 {{ _('Your membership for the organization "%(org)s" has been refused',
     org=(
         '<a href="'|safe
-        + url_for('organizations.show', org=org, _external=True)
+        + org.url_for(_external=True)
         + '">'|safe
         + org.name
         + '</a>'|safe

udata/templates/mail/membership_request.html

@@ -15,7 +15,7 @@
     ),
     org=(
         '<a href="'|safe
-        + url_for('organizations.show', org=org, _external=True)
+        + org.url_for(_external=True)
         + '">'|safe
         + org.name
         + '</a>'|safe

udata/templates/mail/new_member.html

@@ -7,7 +7,7 @@
 {{ _('Congratulations, you are now a member of the organization "%(org)s"',
     org=(
         '<a href="'|safe
-        + url_for('organizations.show', org=org, _external=True)
+        + org.url_for(_external=True)
         + '">'|safe
         + org.name
         + '</a>'|safe
@@ -19,7 +19,7 @@
         <td align="center">
             {{ mail_button(
                 _('See the organization page'),
-                url_for('organizations.show', org=org, _external=True)
+                org.url_for(_external=True)
             ) }}
         </td>
     </tr>

udata/templates/mail/new_member.txt

@@ -7,5 +7,5 @@
 
 
 {{ _('You can go on your organization page') }}:
-{{ url_for('organizations.show', org=org, _external=True) }}
+{{ org.url_for(_external=True) }}
 {% endblock %}

{udata-7.0.4.dev27568.dist-info → udata-7.0.4.dev27593.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 7.0.4.dev27568
+Version: 7.0.4.dev27593
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -140,6 +140,9 @@ It is collectively taken care of by members of the
   - Organization can nom define a custom metadata of a choosen type
   - Dataset belonging to the organization can assign a value to the defined metadata
   - Metadata value must match the choosen type by the organization
+- Fix: do not send mail about discussions when there is no owner / no organisation members [#2962](https://github.com/opendatateam/udata/pull/2962)
+- Fix: 'backend' is now required in `HarvestSource` [#2962](https://github.com/opendatateam/udata/pull/2962)
+- Fix: URL to organizations in mails are now independent from `udata-front` (show the URL of the API if no `udata-front`) [#2962](https://github.com/opendatateam/udata/pull/2962)
 
 ## 7.0.3 (2024-02-15)
 

{udata-7.0.4.dev27568.dist-info → udata-7.0.4.dev27593.dist-info}/RECORD

@@ -11,7 +11,7 @@ udata/mail.py,sha256=dAMcbEtk5e54alpQezvF5adDrRPgdaT36QEdHD_5v50,2145
 udata/rdf.py,sha256=js76f1zsiFt0A9ackhFqjegJonlGpR9QndEnUk0L8Xg,8378
 udata/routing.py,sha256=ztmFx4YzqlEqa-HG9a43WfGYfULC95ZxTlkr4iHkzVQ,7045
 udata/sentry.py,sha256=KiZz0PpmYpZMvykH9UAbHpF4xBY0Q-8DeiEbXEHDUdw,2683
-udata/settings.py,sha256=-QWwiAejRLfyj4PrsTZgj2lF5AUMujRDB33Md0kUx6E,16712
+udata/settings.py,sha256=1iC7X3HE-H9RnKcscbgaaqDuzy-KtrbvrhznB-rZzw8,16616
 udata/sitemap.py,sha256=pjtR2lU3gRHvK8l1Lw8B9wrqMMTYC5adUfFh0pUp_Q4,977
 udata/tags.py,sha256=8MvgyjfUz8O71tCV0V1fQV4_0C2P-SLFrm2IA2QfNDs,595
 udata/tasks.py,sha256=WR07NfqRMpEBNOnsXZ9myvDDSVfx4R5VZCi3CgO53A8,4886
@@ -96,7 +96,7 @@ udata/core/dataset/signals.py,sha256=TK6dfrOUitZZkGGOh6XmhYqYvIjzZpI70JTLV4k-JRM
 udata/core/dataset/tasks.py,sha256=VB1sQ6Fwbax46IRLGyZUDPGgGOWBYrzAlKzV3npDCyM,8412
 udata/core/discussions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/discussions/actions.py,sha256=l8FaRpNdnwq5M7IYA9lh1qhhTlk2XOnYkgt0dLJpowU,789
-udata/core/discussions/api.py,sha256=4hqGHdEMVLun6OgY3vxtHc50i3ffy39PPWchWxJFZZ8,8633
+udata/core/discussions/api.py,sha256=YlLxVA3GFcek8Q9Qb-R8KbNza2Ia3a9zNTU9PGewims,8554
 udata/core/discussions/factories.py,sha256=NQd_tD0Izrm67uO5HuuClmluteACrRd9PHrb2IkQ0P0,350
 udata/core/discussions/forms.py,sha256=PJ1z_q2erqG3aoRrbITKeUeuHcUO-iiL1pp7WU2lnb8,806
 udata/core/discussions/metrics.py,sha256=qtgyDhM1aPgh8bGU-h-962EKR3J44imC155JVi6jvJI,362
@@ -104,7 +104,7 @@ udata/core/discussions/models.py,sha256=McFQrZw3-IlHE_rBlAf1OMOpnT_PHbm4yLPsSvsR
 udata/core/discussions/notifications.py,sha256=1lsu8WyyOL4bdt0lx6IW5wTxmQ5gS_7FoncN53g3ToQ,927
 udata/core/discussions/permissions.py,sha256=q3tXNuNmuXCvZhKyudROcwXF53l-IeDR3pfKSh_hIL0,636
 udata/core/discussions/signals.py,sha256=zjuF-TiFwu9U_RcgZtHB2Z3W4oBx5hVZy6CCAl5Ekug,543
-udata/core/discussions/tasks.py,sha256=yxvxNNLKDD1FM_ItPRArDI2CtJFQSgC69yf__tBQQAo,2840
+udata/core/discussions/tasks.py,sha256=T_Pi7xgbNH0ulQsxRETZvMIoWikh4QKuwA2jW8rLKBI,2911
 udata/core/followers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/followers/api.py,sha256=9777c3RQUNOemQgL5SQI_U6ya4-Mwm8T2hXaXm_B_RM,2601
 udata/core/followers/metrics.py,sha256=nKgoiM2Gu-XHrgEf9duW1My66zFSKbmw25BGqo5wWtY,190
@@ -255,21 +255,21 @@ udata/harvest/csv.py,sha256=c2fPnMB6q99wRxLncl8L0ILcdF4SI8Lsl8tViNrcW6A,396
 udata/harvest/exceptions.py,sha256=YaXw0ESmSCcibfUmP5uc1uRedKD2mvUBXUOnbaSXtNw,299
 udata/harvest/filters.py,sha256=VGSbMLOXQ9ay5GlTvCwN1_EmWX6KEXs-RPcOXo45Q6U,2615
 udata/harvest/forms.py,sha256=AxEFhBACjXVT9X1bSK8WzDAZgWg-hdaWBebFb1ihNYo,3389
-udata/harvest/models.py,sha256=SodOCv14_7zAeagHiWG91jwWsEr6RGBrn84SoZ-jz04,5934
+udata/harvest/models.py,sha256=-C2vlyvQqXyO6COJydGaaob0JOXPGKRMVdrmElHhyfU,5947
 udata/harvest/notifications.py,sha256=aNKUtUl73Caj_kl-ENOEbTX_cgtySqLjHhtH9FEDR9Y,774
 udata/harvest/signals.py,sha256=wlXTi1E7rIVyNvxw0yUqyN5gF3thg276LAOmAF9vDJY,1338
-udata/harvest/tasks.py,sha256=3KkHuyFzGrjoBvLoT1V1VPJooyOIbv2Ze9QSXXWJ0ec,1949
+udata/harvest/tasks.py,sha256=0VhefKCQJSU_puTpdKOpvt3WORXHAFWGEB-R_MhB12M,1981
 udata/harvest/backends/__init__.py,sha256=qcLhHKWO97TeWd93ZwymG_Cc9FO7sMM7h4fs6XYdtS8,447
-udata/harvest/backends/base.py,sha256=YUBTAMDNFfWpzMQgVNjSOzo9aKZYibyat4pPjErNdwo,12248
+udata/harvest/backends/base.py,sha256=oaPQcQ0onIXH5ofUtWH5sM6_5_wSBLawHSOjeeoG6jQ,12258
 udata/harvest/backends/dcat.py,sha256=ll9RWAjoLvnyoI7iviatsJWN5XFRQuYzDeBKlbaHxCc,8702
 udata/harvest/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-udata/harvest/tests/factories.py,sha256=l1FRbM6-iblzIm4HDwQ23EnmoSDguQFGN4l_ygzSdGY,1981
+udata/harvest/tests/factories.py,sha256=CbQORC1OJ1_Agtv_3LjCXysNumjMYlROwZPSEAHo8sM,2005
 udata/harvest/tests/test_actions.py,sha256=7xSpouCAcf5p_bd38zHCyPN7sKWUUZXA7IlpI-yNVrQ,27603
 udata/harvest/tests/test_api.py,sha256=QXhseHfnkBEmMbIJzroMdDYGLDj6Njal1s-2sn0xhEM,14888
 udata/harvest/tests/test_base_backend.py,sha256=JA8Df1Eu-lEPLZfxyK81bsmT6exOjV_3PtKHJekAp5g,12092
 udata/harvest/tests/test_dcat_backend.py,sha256=rEpwQw07OpnjnZorvWvKyYwnkeTuIETQftLBoPDUksQ,21126
 udata/harvest/tests/test_filters.py,sha256=V2HFZlexIJa6r1DX6g2ktvIgjg4gSY11QPfPOd3_Oug,2370
-udata/harvest/tests/test_models.py,sha256=Wh2_Bwvfdrj0Fsh8Q8j4yTfLwmYv5WiGbGhrvf6zbII,905
+udata/harvest/tests/test_models.py,sha256=p2VazyrPXSArBuf8Kf19TGPcQ86SnOGCGmvjcMOw0s0,924
 udata/harvest/tests/test_notifications.py,sha256=ZwtwioittW3XcZc0x6zbHjs1dVaAxPytlVymnJa5w0E,817
 udata/harvest/tests/test_tasks.py,sha256=OfUnsg6x3DtbS2s3ToRDZY46aqqmbowN1sqASmsLaN4,680
 udata/harvest/tests/csw_dcat/geonetworkv4-page-1.xml,sha256=k2pKidlQvJpoltGFm9HNh6KHai7nrPcpinDSQS4dGkQ,17040
@@ -486,16 +486,16 @@ udata/templates/mail/discussion_closed.html,sha256=i98g4PPos5GQ_QE6xHma1cchnCWQx
 udata/templates/mail/discussion_closed.txt,sha256=ZvEnfsVCAHDzYlzHFCas-Grj_oiVZs3A7X7A2u1ngBs,380
 udata/templates/mail/frequency_reminder.html,sha256=McTRYsUfnvSGNIvov9SDryTlS1LTl8TMMQs_k8fAxh8,1182
 udata/templates/mail/frequency_reminder.txt,sha256=3IDPkrZEGmGm_gULSuYdq7VMKsQe0o5CZWNw8fbxpco,724
-udata/templates/mail/membership_refused.html,sha256=0pnX2aqDk3kEQBsBOlIiGwx_vBIQBWOZUQEpFE0VFVk,635
+udata/templates/mail/membership_refused.html,sha256=KygLjFxJfCL-GRG_Msf6qCJ_Kv_fzFB6AklRIiPOMi0,608
 udata/templates/mail/membership_refused.txt,sha256=rXur42ZD3W65SCblUrZqMK34RHz0oSYL4-rb_kKmE0g,217
-udata/templates/mail/membership_request.html,sha256=2ygBg1w20jRru5shsu-4FZjzIoschtnP6TUcU0Nc_Q4,1434
+udata/templates/mail/membership_request.html,sha256=3jRG5Xp6sJNbST3Lc6FGaInjShLrOznA6Cjp6rPilKY,1407
 udata/templates/mail/membership_request.txt,sha256=NBxMyNYUayQC9RbeWiws4JEOm4EpagU_GkPQJZcqKps,462
 udata/templates/mail/new_discussion.html,sha256=itzbuSg-SUJCDA78fFgeEGB2t1cI5nwhfxzJYT0XLJg,1090
 udata/templates/mail/new_discussion.txt,sha256=J1LJXTePrnZsvCLUcUG505SU5mIz0glmJlwcecujap8,403
 udata/templates/mail/new_discussion_comment.html,sha256=BvDL3JV5lOPgPco0n6LTKXFLbYFcRqYFJp_6D_yLmkw,1155
 udata/templates/mail/new_discussion_comment.txt,sha256=gct1ab7BVw2D-FB2D3e1t8oGtKAsvrEcRe36Lm4fr-E,383
-udata/templates/mail/new_member.html,sha256=WrpWcqgbeGGRiL9-2LoE7zWcYheDw1bcT2Qcly_G1kY,794
-udata/templates/mail/new_member.txt,sha256=h2vzrlNXcgPHgKnX3_jBPxvwkXzi0CjvA_VbLfzDdjY,274
+udata/templates/mail/new_member.html,sha256=z8SY_MCosTz3N8HjxyqF7oFxxofSLJbnQdKfxwq3cz4,740
+udata/templates/mail/new_member.txt,sha256=5eF26j4-BAt7I-U2wkwlTODHFNe91A8N1EdKnWqKPDI,247
 udata/templates/mail/new_reuse.html,sha256=Yb69cb2bb5d9oEdsKUBWQ0scJ5r_WhECJMSyiYabpAo,1366
 udata/templates/mail/new_reuse.txt,sha256=Uhpcp5JccAbSNgT-keiOtwlVe-NaYJiwh9GOCDaBc_c,447
 udata/templates/mail/test.html,sha256=8oNjUUHmBnPZbrar9Qv3hg8jSesTKOqvXO6xqeO6BT0,232
@@ -646,9 +646,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=sbRJJcf9afMBJx3L8qGez5XoILhNMI
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=sv-oskJPJ6SStK6TWA-Wa28ssmrJweWLw4M__Sln-_Q,41902
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=YsXkmamsMG_H0I4tfmP_9JfXxyplpJHxFwIZr6jW9eU,29088
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=QsVYsk6FRVtKmfxKv427qPmYcw2mx_wuE79aaWNeaYA,48743
-udata-7.0.4.dev27568.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-7.0.4.dev27568.dist-info/METADATA,sha256=EuoCfFhxImCoitCtv_ZqboJfL_FGtYLDd96sVthdvtk,116235
-udata-7.0.4.dev27568.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-udata-7.0.4.dev27568.dist-info/entry_points.txt,sha256=ZqIUHhOth0MMQvMIeuhODbUCDwjR-Hvo7PaKrMwTKuQ,384
-udata-7.0.4.dev27568.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-7.0.4.dev27568.dist-info/RECORD,,
+udata-7.0.4.dev27593.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-7.0.4.dev27593.dist-info/METADATA,sha256=B0hcXJ4uuYvD7uKqX4yzgsfx7So0PPJjoKjlhMflUIw,116671
+udata-7.0.4.dev27593.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+udata-7.0.4.dev27593.dist-info/entry_points.txt,sha256=ZqIUHhOth0MMQvMIeuhODbUCDwjR-Hvo7PaKrMwTKuQ,384
+udata-7.0.4.dev27593.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-7.0.4.dev27593.dist-info/RECORD,,