Skip to content

GitLab

Commit 0204a094 authored by Florent Chehab's avatar Florent Chehab
Browse files

Fix naming to prevent confusion of module vs function

parent 2b4429c0
Pipeline #27147 passed with stages
in 2 minutes and 37 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 35 deletions
backend/custom/mySerializerWithJSON.py
View file @ 0204a094
from backend.fields.jSONField import JSONField
from backend.fields import JSONField
from rest_framework import serializers
field_mapping = serializers.ModelSerializer.serializer_field_mapping
......
backend/fields/__init__.py deleted 100644 → 0
View file @ 2b4429c0
from .jSONField import JSONField # noqa: F401
backend/migrations/0001_initial.py
View file @ 0204a094
# Generated by Django 2.0.3 on 2018-09-10 14:19
import backend.fields.jSONField
import backend.fields
import backend.models.abstract.my_model.myModel
import backend.models.university.university
from django.conf import settings
......@@ -26,7 +26,7 @@ class Migration(migrations.Migration):
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('usefull_links', backend.fields.jSONField.JSONField(default=list)),
('usefull_links', backend.fields.JSONField(default=list)),
('importance_level', models.CharField(choices=[('-', 'normal'), ('+', 'important'), ('++', 'IMPORTANT')], default='-', max_length=2)),
('is_main_campus', models.BooleanField()),
('name', models.CharField(max_length=200, null=True)),
......@@ -43,9 +43,9 @@ class Migration(migrations.Migration):
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('comment', models.TextField(blank=True)),
('usefull_links', backend.fields.jSONField.JSONField(default=list)),
('usefull_links', backend.fields.JSONField(default=list)),
('importance_level', models.CharField(choices=[('-', 'normal'), ('+', 'important'), ('++', 'IMPORTANT')], default='-', max_length=2)),
('custom_content', backend.fields.jSONField.JSONField(default=dict)),
('custom_content', backend.fields.JSONField(default=dict)),
('campus', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='campus_tagged_items', to='backend.Campus')),
('moderated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
],
......@@ -73,9 +73,9 @@ class Migration(migrations.Migration):
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('comment', models.TextField(blank=True)),
('usefull_links', backend.fields.jSONField.JSONField(default=list)),
('usefull_links', backend.fields.JSONField(default=list)),
('importance_level', models.CharField(choices=[('-', 'normal'), ('+', 'important'), ('++', 'IMPORTANT')], default='-', max_length=2)),
('custom_content', backend.fields.jSONField.JSONField(default=dict)),
('custom_content', backend.fields.JSONField(default=dict)),
('city', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='city_tagged_items', to='backend.City')),
('moderated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
],
......@@ -110,7 +110,7 @@ class Migration(migrations.Migration):
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('comment', models.TextField(blank=True)),
('usefull_links', backend.fields.jSONField.JSONField(default=list)),
('usefull_links', backend.fields.JSONField(default=list)),
('importance_level', models.CharField(choices=[('-', 'normal'), ('+', 'important'), ('++', 'IMPORTANT')], default='-', max_length=2)),
('country', models.ManyToManyField(related_name='country_dri', to='backend.Country')),
('moderated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
......@@ -128,7 +128,7 @@ class Migration(migrations.Migration):
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('comment', models.TextField(blank=True)),
('usefull_links', backend.fields.jSONField.JSONField(default=list)),
('usefull_links', backend.fields.JSONField(default=list)),
('importance_level', models.CharField(choices=[('-', 'normal'), ('+', 'important'), ('++', 'IMPORTANT')], default='-', max_length=2)),
('type', models.CharField(max_length=200)),
('amount_min', models.DecimalField(decimal_places=2, max_digits=20, validators=[django.core.validators.MinValueValidator(0)])),
......@@ -147,9 +147,9 @@ class Migration(migrations.Migration):
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('comment', models.TextField(blank=True)),
('usefull_links', backend.fields.jSONField.JSONField(default=list)),
('usefull_links', backend.fields.JSONField(default=list)),
('importance_level', models.CharField(choices=[('-', 'normal'), ('+', 'important'), ('++', 'IMPORTANT')], default='-', max_length=2)),
('custom_content', backend.fields.jSONField.JSONField(default=dict)),
('custom_content', backend.fields.JSONField(default=dict)),
('country', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='country_tagged_items', to='backend.Country')),
('moderated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
],
......@@ -236,7 +236,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('object_id', models.CharField(max_length=100)),
('updated_on', models.DateTimeField(null=True)),
('new_object', backend.fields.jSONField.JSONField(default=dict)),
('new_object', backend.fields.JSONField(default=dict)),
('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')),
('updated_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
......@@ -250,7 +250,7 @@ class Migration(migrations.Migration):
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('Utc_departure_id', models.IntegerField()),
('is_anonymous', models.BooleanField()),
('courses', backend.fields.jSONField.JSONField(null=True)),
('courses', backend.fields.JSONField(null=True)),
('moderated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
],
options={
......@@ -266,7 +266,7 @@ class Migration(migrations.Migration):
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('is_anonymous', models.BooleanField(default=True)),
('is_public', models.BooleanField(default=False)),
('courses_and_courses_feedback', backend.fields.jSONField.JSONField(default=dict)),
('courses_and_courses_feedback', backend.fields.JSONField(default=dict)),
('adequation_comment', models.TextField()),
('integration_comment', models.TextField()),
('adequation_grate', models.PositiveIntegerField(validators=[django.core.validators.MaxValueValidator(20)])),
......@@ -349,7 +349,7 @@ class Migration(migrations.Migration):
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('name', models.CharField(max_length=100, unique=True)),
('config', backend.fields.jSONField.JSONField(default=dict)),
('config', backend.fields.JSONField(default=dict)),
('moderated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
],
......@@ -382,7 +382,7 @@ class Migration(migrations.Migration):
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('comment', models.TextField(blank=True)),
('usefull_links', backend.fields.jSONField.JSONField(default=list)),
('usefull_links', backend.fields.JSONField(default=list)),
('importance_level', models.CharField(choices=[('-', 'normal'), ('+', 'important'), ('++', 'IMPORTANT')], default='-', max_length=2)),
('moderated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
],
......@@ -398,7 +398,7 @@ class Migration(migrations.Migration):
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('comment', models.TextField(blank=True)),
('usefull_links', backend.fields.jSONField.JSONField(default=list)),
('usefull_links', backend.fields.JSONField(default=list)),
('importance_level', models.CharField(choices=[('-', 'normal'), ('+', 'important'), ('++', 'IMPORTANT')], default='-', max_length=2)),
('type', models.CharField(max_length=200)),
('amount_min', models.DecimalField(decimal_places=2, max_digits=20, validators=[django.core.validators.MinValueValidator(0)])),
......@@ -418,9 +418,9 @@ class Migration(migrations.Migration):
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('comment', models.TextField(blank=True)),
('usefull_links', backend.fields.jSONField.JSONField(default=list)),
('usefull_links', backend.fields.JSONField(default=list)),
('importance_level', models.CharField(choices=[('-', 'normal'), ('+', 'important'), ('++', 'IMPORTANT')], default='-', max_length=2)),
('custom_content', backend.fields.jSONField.JSONField(default=dict)),
('custom_content', backend.fields.JSONField(default=dict)),
('moderated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
('tag', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='backend.Tag')),
],
......@@ -432,10 +432,10 @@ class Migration(migrations.Migration):
('moderated_on', models.DateTimeField(null=True)),
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('contact_info', backend.fields.jSONField.JSONField(default=dict)),
('contact_info', backend.fields.JSONField(default=dict)),
('contact_info_is_public', models.BooleanField(default=False)),
('config', backend.fields.jSONField.JSONField(default=dict)),
('other_data', backend.fields.jSONField.JSONField(default=dict)),
('config', backend.fields.JSONField(default=dict)),
('other_data', backend.fields.JSONField(default=dict)),
],
options={
'abstract': False,
......@@ -448,7 +448,7 @@ class Migration(migrations.Migration):
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('comment', models.TextField(blank=True)),
('usefull_links', backend.fields.jSONField.JSONField(default=list)),
('usefull_links', backend.fields.JSONField(default=list)),
('importance_level', models.CharField(choices=[('-', 'normal'), ('+', 'important'), ('++', 'IMPORTANT')], default='-', max_length=2)),
('university', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='university_info', serialize=False, to='backend.University')),
('cost_exchange', models.DecimalField(decimal_places=2, max_digits=20, null=True, validators=[django.core.validators.MinValueValidator(0)])),
......@@ -468,7 +468,7 @@ class Migration(migrations.Migration):
('updated_on', models.DateTimeField(null=True)),
('obj_moderation_level', models.SmallIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), backend.models.abstract.my_model.myModel.validate_obj_model_lv])),
('comment', models.TextField(blank=True)),
('usefull_links', backend.fields.jSONField.JSONField(default=list)),
('usefull_links', backend.fields.JSONField(default=list)),
('importance_level', models.CharField(choices=[('-', 'normal'), ('+', 'important'), ('++', 'IMPORTANT')], default='-', max_length=2)),
('university', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='university_semesters_dates', serialize=False, to='backend.University')),
('spring_begin', models.DateField(blank=True, null=True)),
......
backend/permissions/__init__.py
View file @ 0204a094
......@@ -7,4 +7,4 @@ from .isDriOrReadOnly import IsDriOrReadOnly # noqa: F401
from .default_viewset_permissions import DEFAULT_VIEWSET_PERMISSIONS # noqa: F401
from .obj_moderation_permission import OBJ_MODERATION_PERMISSIONS # noqa: F401
from .obj_moderation_permission import DEFAULT_OBJ_MODERATION_LV # noqa: F401
from .is_moderation_required import is_moderation_required # noqa: F401
from .__is_moderation_required import is_moderation_required # noqa: F401
backend/permissions/is_moderation_required.py → backend/permissions/__is_moderation_required.py
View file @ 0204a094
from backend.utils.get_user_level import get_user_level
from backend.utils.__get_user_level import get_user_level
from django.conf import settings
from .obj_moderation_permission import OBJ_MODERATION_PERMISSIONS
......
backend/utils/does_user_have_moderation_rights.py → backend/utils/__does_user_have_moderation_rights.py
View file @ 0204a094
from .is_member import is_member
from backend.utils import is_member
def does_user_have_moderation_rights(user):
......
backend/utils/get_user_level.py → backend/utils/__get_user_level.py
View file @ 0204a094
from .is_member import is_member
from .__is_member import is_member
from backend.permissions import OBJ_MODERATION_PERMISSIONS
......
backend/utils/__init__.py
View file @ 0204a094
from .is_member import is_member # noqa: F401
from .find_api_end_point_for_viewset import find_api_end_point_for_viewset # noqa: F401
from .get_model_config import get_model_config # noqa: F401
from .get_viewset_permissions import get_viewset_permissions # noqa: F401
from .does_user_have_moderation_rights import does_user_have_moderation_rights # noqa: F401
from .get_user_level import get_user_level # noqa: F401
from .__is_member import is_member # noqa: F401
from .__get_viewset_permissions import get_viewset_permissions # noqa: F401
from .__find_api_end_point_for_viewset import find_api_end_point_for_viewset # noqa: F401
from .__get_user_level import get_user_level # noqa: F401
from .__get_model_config import get_model_config # noqa: F401
from .__does_user_have_moderation_rights import does_user_have_moderation_rights # noqa: F401
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment