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.

Merge branch 'develop'

+23 -2
+2 -1
upvcarshare/journeys/managers.py
··· 187 187 "departure__gte": departure_lower, 188 188 })) 189 189 now = timezone.now() 190 - queryset = self.available(user=user, ignore_full=ignore_full).exclude(user=user, departure__lt=now) \ 190 + queryset = self.available(user=user, ignore_full=ignore_full)\ 191 + .exclude(user=user, departure__lt=now, disabled=True) \ 191 192 .filter(reduce(lambda x, y: x | y, conditions)) \ 192 193 .order_by("departure") 193 194 return queryset
+20
upvcarshare/journeys/migrations/0014_auto_20170530_0923.py
··· 1 + # -*- coding: utf-8 -*- 2 + # Generated by Django 1.10.2 on 2017-05-30 09:23 3 + from __future__ import unicode_literals 4 + 5 + from django.db import migrations, models 6 + 7 + 8 + class Migration(migrations.Migration): 9 + 10 + dependencies = [ 11 + ('journeys', '0013_journey_total_passengers'), 12 + ] 13 + 14 + operations = [ 15 + migrations.AlterField( 16 + model_name='journey', 17 + name='time_window', 18 + field=models.PositiveIntegerField(blank=True, default=30, help_text='Se buscarán por los viajes que salgan hasta con estos minutos de antelación', verbose_name='ventana de tiempo'), 19 + ), 20 + ]
+1 -1
upvcarshare/templates/journeys/create.smart.html
··· 73 73 {% endif %} 74 74 {% endfor %} 75 75 <div class="form-group"> 76 - <div class="offset-sm-2 col-sm-8"> 76 + <div class="col-sm-2 pull-right"> 77 77 <button type="submit" class="btn btn-success">{% trans "Guardar" %}</button> 78 78 <a href="{% url "journeys:list" %}" class="btn btn-danger">{% trans "Volver" %}</a> 79 79 </div>