udata 6.1.7.dev25993__py2.py3-none-any.whl → 6.1.7.dev26008__py2.py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of udata might be problematic. Click here for more details.

Files changed (20) hide show
  1. udata/core/organization/forms.py +4 -2
  2. udata/core/organization/models.py +0 -1
  3. udata/settings.py +5 -0
  4. udata/static/admin.js +3 -3
  5. udata/static/admin.js.map +1 -1
  6. udata/static/chunks/{1.a89484c2e9e7c887e74b.js → 1.2a80f2805f0ad61574e4.js} +2 -2
  7. udata/static/chunks/1.2a80f2805f0ad61574e4.js.map +1 -0
  8. udata/static/chunks/{29.c04d2827d03bf6177396.js → 29.7b551c87d15f96f30b57.js} +2 -2
  9. udata/static/chunks/29.7b551c87d15f96f30b57.js.map +1 -0
  10. udata/static/common.js +1 -1
  11. udata/static/common.js.map +1 -1
  12. udata/templates/macros/metadata.html +3 -0
  13. {udata-6.1.7.dev25993.dist-info → udata-6.1.7.dev26008.dist-info}/METADATA +2 -2
  14. {udata-6.1.7.dev25993.dist-info → udata-6.1.7.dev26008.dist-info}/RECORD +18 -18
  15. udata/static/chunks/1.a89484c2e9e7c887e74b.js.map +0 -1
  16. udata/static/chunks/29.c04d2827d03bf6177396.js.map +0 -1
  17. {udata-6.1.7.dev25993.dist-info → udata-6.1.7.dev26008.dist-info}/LICENSE +0 -0
  18. {udata-6.1.7.dev25993.dist-info → udata-6.1.7.dev26008.dist-info}/WHEEL +0 -0
  19. {udata-6.1.7.dev25993.dist-info → udata-6.1.7.dev26008.dist-info}/entry_points.txt +0 -0
  20. {udata-6.1.7.dev25993.dist-info → udata-6.1.7.dev26008.dist-info}/top_level.txt +0 -0
udata/core/organization/forms.py CHANGED
@@ -1,10 +1,12 @@
1
+ from flask import current_app
2
+
1
3
  from udata.auth import current_user
2
4
  from udata.forms import Form, ModelForm, fields, validators
3
5
  from udata.i18n import lazy_gettext as _
4
6
 
5
7
  from .models import (
6
8
  Organization, MembershipRequest, Member, LOGO_SIZES, ORG_ROLES,
7
- TITLE_SIZE_LIMIT, DESCRIPTION_SIZE_LIMIT, ORG_BID_SIZE_LIMIT, ORG_BID_FORMAT
9
+ TITLE_SIZE_LIMIT, DESCRIPTION_SIZE_LIMIT
8
10
  )
9
11
 
10
12
  __all__ = (
@@ -18,7 +20,7 @@ __all__ = (
18
20
  def org_bid_check(form, field):
19
21
  if field.data:
20
22
  # EID checks are country dependant. Following one is suitable for France.
21
- if ORG_BID_FORMAT == 'siret':
23
+ if current_app.config.get('ORG_BID_FORMAT') == 'siret':
22
24
  siret_number = str(field.data)
23
25
  # Length control done here instead of using WTForm validator because field must remain optional.
24
26
  if len(siret_number) != 14:
udata/core/organization/models.py CHANGED
@@ -41,7 +41,6 @@ TITLE_SIZE_LIMIT = 350
41
41
  DESCRIPTION_SIZE_LIMIT = 100000
42
42
 
43
43
  ORG_BID_SIZE_LIMIT = 14
44
- ORG_BID_FORMAT = 'siret'
45
44
 
46
45
 
47
46
  class Team(db.EmbeddedDocument):
udata/settings.py CHANGED
@@ -364,6 +364,11 @@ class Defaults(object):
364
364
  # Default pagination size on listing
365
365
  POST_DEFAULT_PAGINATION = 20
366
366
 
367
+ # Organization settings
368
+ ###########################################################################
369
+ # The business identification format to use for validation
370
+ ORG_BID_FORMAT = 'siret'
371
+
367
372
  # Dataset settings
368
373
  ###########################################################################
369
374
  # Max number of resources to display uncollapsed in dataset view