mgabarda.com / upvcarshare
Project for the UPV to develop an app like BlaBlaCar but only for UPV people.
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

added migrations

Marcos Gabarda Inat 5abe19ff 7da51bfe

+87 -3
+52
upvcarshare/journeys/migrations/0012_auto_20161024_1001.py
··· 1 + # -*- coding: utf-8 -*- 2 + # Generated by Django 1.10.2 on 2016-10-24 10:01 3 + from __future__ import unicode_literals 4 + 5 + from django.db import migrations, models 6 + import django.db.models.deletion 7 + import recurrence.fields 8 + 9 + 10 + class Migration(migrations.Migration): 11 + 12 + dependencies = [ 13 + ('journeys', '0011_journey_parent'), 14 + ] 15 + 16 + operations = [ 17 + migrations.AlterField( 18 + model_name='journey', 19 + name='arrival', 20 + field=models.DateTimeField(blank=True, null=True, verbose_name='fecha y hora de llegada estimada*'), 21 + ), 22 + migrations.AlterField( 23 + model_name='journey', 24 + name='departure', 25 + field=models.DateTimeField(verbose_name='fecha y hora de salida*'), 26 + ), 27 + migrations.AlterField( 28 + model_name='journey', 29 + name='kind', 30 + field=models.PositiveIntegerField(choices=[(0, 'ida'), (1, 'vuelta')], verbose_name='tipo de viaje'), 31 + ), 32 + migrations.AlterField( 33 + model_name='journey', 34 + name='parent', 35 + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='journeys.Journey'), 36 + ), 37 + migrations.AlterField( 38 + model_name='journey', 39 + name='recurrence', 40 + field=recurrence.fields.RecurrenceField(blank=True, null=True, verbose_name='¿Vas a realizar este viaje más de una vez?'), 41 + ), 42 + migrations.AlterField( 43 + model_name='journey', 44 + name='time_window', 45 + field=models.PositiveIntegerField(blank=True, default=30, help_text='Se buscaran por los viajes que salgan hasta con estos minutos de antelación', verbose_name='ventana de tiempo'), 46 + ), 47 + migrations.AlterField( 48 + model_name='residence', 49 + name='address', 50 + field=models.TextField(help_text='La dirección del lugar, según quieras que la vean los demás.', verbose_name='dirección'), 51 + ), 52 + ]
+1 -1
upvcarshare/manage.py
··· 4 4 import sys 5 5 6 6 if __name__ == "__main__": 7 - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local") 7 + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings") 8 8 9 9 from django.core.management import execute_from_command_line 10 10
+1 -1
upvcarshare/users/migrations/0001_initial.py
··· 34 34 ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), 35 35 ('default_address', models.TextField(blank=True, null=True)), 36 36 ('default_distance', models.PositiveIntegerField(blank=True, default=500, null=True)), 37 - ('default_position', django.contrib.gis.db.models.fields.PointField(blank=True, null=True, srid=2062)), 37 + ('default_position', django.contrib.gis.db.models.fields.PointField(blank=True, null=True, srid=2062, verbose_name='posición en el mapa por defecto')), 38 38 ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), 39 39 ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), 40 40 ],
+32
upvcarshare/users/migrations/0003_auto_20161024_1001.py
··· 1 + # -*- coding: utf-8 -*- 2 + # Generated by Django 1.10.2 on 2016-10-24 10:01 3 + from __future__ import unicode_literals 4 + 5 + import core.files 6 + import django.contrib.auth.validators 7 + from django.db import migrations, models 8 + 9 + 10 + class Migration(migrations.Migration): 11 + 12 + dependencies = [ 13 + ('users', '0002_auto_20160619_1804'), 14 + ] 15 + 16 + operations = [ 17 + migrations.AlterField( 18 + model_name='user', 19 + name='avatar', 20 + field=models.ImageField(blank=True, max_length=255, null=True, upload_to=core.files.UploadToDir('avatars/', random_name=True)), 21 + ), 22 + migrations.AlterField( 23 + model_name='user', 24 + name='default_address', 25 + field=models.TextField(blank=True, help_text='Dirección que por defecto se usará para crear trayectos, y que será la dirección que vean otros usuarios', null=True, verbose_name='dirección por defecto'), 26 + ), 27 + migrations.AlterField( 28 + model_name='user', 29 + name='username', 30 + field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username'), 31 + ), 32 + ]
+1 -1
upvcarshare/users/tests/test_api.py
··· 36 36 self.assertEqual(response.status_code, status.HTTP_200_OK) 37 37 user = User.objects.get(pk=self.user.pk) 38 38 self.assertEquals( 39 - "SRID=4326;POINT (-0.3767699999989403 39.46913999999703)", 39 + "SRID=4326;POINT (-0.3767699999989399 39.46913999999703)", 40 40 six.text_type(user.get_default_position_wgs84()) 41 41 ) 42 42 self.assertEquals("foo", user.default_address)