Download as
Browse Code »

Commit cf8194c2a2511f3d673d9c8435ec923b35aa312f

Authored by Felipe Henrique de Almeida Bormann
1 parent 2384ac7f
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

added validation error for create and update link about checking initial_view an… 

…d requiring initial_view_date
Showing 8 changed files with 134 additions and 18 deletions   Show diff stats
categories/migrations/0010_auto_20170201_0013.py 0 → 100644
  Diff comments   View file @cf8194c
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10.4 on 2017-02-01 03:13
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.conf import settings
  6 +from django.db import migrations, models
  7 +
  8 +
  9 +class Migration(migrations.Migration):
  10 +
  11 + dependencies = [
  12 + ('categories', '0009_auto_20170130_1828'),
  13 + ]
  14 +
  15 + operations = [
  16 + migrations.AlterField(
  17 + model_name='category',
  18 + name='coordinators',
  19 + field=models.ManyToManyField(blank=True, related_name='coordinators', to=settings.AUTH_USER_MODEL),
  20 + ),
  21 + ]
links/forms.py
  Diff comments   View file @cf8194c
@@ -26,8 +26,8 @@ class LinkForm(forms.ModelForm): @@ -26,8 +26,8 @@ class LinkForm(forms.ModelForm):
26 26
27 tags = forms.CharField(label = _('Tags'), required = False) 27 tags = forms.CharField(label = _('Tags'), required = False)
28 link_url = forms.URLField(label = _('Website URL'),required=True) 28 link_url = forms.URLField(label = _('Website URL'),required=True)
29 - initial_view_date = forms.DateField(input_formats=['%Y/%m/%d', '%d/%m/%Y', '%m/%d/%Y'])  
30 - end_view_date = forms.DateField(input_formats=['%Y/%m/%d', '%d/%m/%Y', '%m/%d/%Y']) 29 + initial_view_date = forms.DateTimeField(input_formats=['%Y/%m/%d %H:%M', '%d/%m/%Y %H:%M', '%m/%d/%Y %H:%M'], required=False)
  30 + end_view_date = forms.DateTimeField(input_formats=['%Y/%m/%d %H:%M', '%d/%m/%Y %H:%M', '%m/%d/%Y %H:%M'], required=False ,help_text=[_('It sets a limit date to finish viewing the website link ')])
31 31
32 class Meta: 32 class Meta:
33 model = Link 33 model = Link
@@ -49,21 +49,13 @@ class LinkForm(forms.ModelForm): @@ -49,21 +49,13 @@ class LinkForm(forms.ModelForm):
49 49
50 if cleaned_data.get('end_view'): 50 if cleaned_data.get('end_view'):
51 end_view = cleaned_data.get('end_view') 51 end_view = cleaned_data.get('end_view')
52 - if end_view:  
53 - if cleaned_data.get('end_view_date'):  
54 - end_view_date = cleaned_data.get('end_view_date')  
55 - print(end_view_date)  
56 - if not end_view_date:  
57 - raise ValidationError(_('End View Date is not set'), code='invalid' ) 52 + if end_view and not cleaned_data.get('end_view_date'):
  53 + raise ValidationError(_('End View Date is not set'), code='invalid' )
58 54
59 if cleaned_data.get('initial_view'): 55 if cleaned_data.get('initial_view'):
60 initial_view = cleaned_data.get('initial_view') 56 initial_view = cleaned_data.get('initial_view')
61 - if initial_view:  
62 - if cleaned_data.get('initial_view_date'):  
63 - initial_view_date = cleaned_data.get('initial_view_date')  
64 - print(initial_view_date)  
65 - if not initial_view_date:  
66 - raise ValidationError(_('Initial View Date is not set'), code='invalid' ) 57 + if initial_view and not cleaned_data.get('initial_view_date'):
  58 + raise ValidationError(_('Initial View Date is not set'), code='invalid' )
67 59
68 return cleaned_data 60 return cleaned_data
69 61
links/migrations/0002_auto_20170201_0013.py 0 → 100644
  Diff comments   View file @cf8194c
@@ -0,0 +1,25 @@ @@ -0,0 +1,25 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10.4 on 2017-02-01 03:13
  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 + ('links', '0001_initial'),
  12 + ]
  13 +
  14 + operations = [
  15 + migrations.AlterField(
  16 + model_name='link',
  17 + name='end_view_date',
  18 + field=models.DateField(verbose_name='Initial View Date'),
  19 + ),
  20 + migrations.AlterField(
  21 + model_name='link',
  22 + name='initial_view_date',
  23 + field=models.DateField(verbose_name='Initial View Date'),
  24 + ),
  25 + ]
links/migrations/0003_auto_20170201_0029.py 0 → 100644
  Diff comments   View file @cf8194c
@@ -0,0 +1,26 @@ @@ -0,0 +1,26 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10.4 on 2017-02-01 03:29
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.db import migrations, models
  6 +import django.utils.timezone
  7 +
  8 +
  9 +class Migration(migrations.Migration):
  10 +
  11 + dependencies = [
  12 + ('links', '0002_auto_20170201_0013'),
  13 + ]
  14 +
  15 + operations = [
  16 + migrations.AlterField(
  17 + model_name='link',
  18 + name='end_view_date',
  19 + field=models.DateField(default=django.utils.timezone.now, verbose_name='Initial View Date'),
  20 + ),
  21 + migrations.AlterField(
  22 + model_name='link',
  23 + name='initial_view_date',
  24 + field=models.DateField(default=django.utils.timezone.now, verbose_name='Initial View Date'),
  25 + ),
  26 + ]
links/migrations/0004_auto_20170201_0032.py 0 → 100644
  Diff comments   View file @cf8194c
@@ -0,0 +1,26 @@ @@ -0,0 +1,26 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10.4 on 2017-02-01 03:32
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.db import migrations, models
  6 +import django.utils.timezone
  7 +
  8 +
  9 +class Migration(migrations.Migration):
  10 +
  11 + dependencies = [
  12 + ('links', '0003_auto_20170201_0029'),
  13 + ]
  14 +
  15 + operations = [
  16 + migrations.AlterField(
  17 + model_name='link',
  18 + name='end_view_date',
  19 + field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='Initial View Date'),
  20 + ),
  21 + migrations.AlterField(
  22 + model_name='link',
  23 + name='initial_view_date',
  24 + field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='Initial View Date'),
  25 + ),
  26 + ]
links/migrations/0005_auto_20170201_0101.py 0 → 100644
  Diff comments   View file @cf8194c
@@ -0,0 +1,26 @@ @@ -0,0 +1,26 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10.4 on 2017-02-01 04:01
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.db import migrations, models
  6 +import django.utils.timezone
  7 +
  8 +
  9 +class Migration(migrations.Migration):
  10 +
  11 + dependencies = [
  12 + ('links', '0004_auto_20170201_0032'),
  13 + ]
  14 +
  15 + operations = [
  16 + migrations.AlterField(
  17 + model_name='link',
  18 + name='end_view_date',
  19 + field=models.DateTimeField(default=django.utils.timezone.now, null=True, verbose_name='Initial View Date'),
  20 + ),
  21 + migrations.AlterField(
  22 + model_name='link',
  23 + name='initial_view_date',
  24 + field=models.DateTimeField(default=django.utils.timezone.now, null=True, verbose_name='Initial View Date'),
  25 + ),
  26 + ]
links/models.py
  Diff comments   View file @cf8194c
@@ -15,9 +15,9 @@ class Link(Resource): @@ -15,9 +15,9 @@ class Link(Resource):
15 link_url = models.URLField(verbose_name = _("Link_URL")) 15 link_url = models.URLField(verbose_name = _("Link_URL"))
16 16
17 initial_view = models.BooleanField(_('Initial View'), default = False) 17 initial_view = models.BooleanField(_('Initial View'), default = False)
18 - initial_view_date = models.DateField(_('Initial View Date'), default=timezone.now) 18 + initial_view_date = models.DateTimeField(_('Initial View Date'), default= timezone.now, null=True)
19 end_view = models.BooleanField(_('Initial View'), default = False) 19 end_view = models.BooleanField(_('Initial View'), default = False)
20 - end_view_date = models.DateField(_('Initial View Date'), default=timezone.now) 20 + end_view_date = models.DateTimeField(_('Initial View Date'), default=timezone.now, null=True)
21 class Meta: 21 class Meta:
22 verbose_name = "Link" 22 verbose_name = "Link"
23 verbose_name_plural = "Links" 23 verbose_name_plural = "Links"
links/templates/links/_form.html
  Diff comments   View file @cf8194c
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
92 <div class="form-group{% if form.has_error %} has-error {% endif %}"> 92 <div class="form-group{% if form.has_error %} has-error {% endif %}">
93 <label for="{{ form.initial_view_date.auto_id }}">{{ form.initial_view_date.label }}</label> 93 <label for="{{ form.initial_view_date.auto_id }}">{{ form.initial_view_date.label }}</label>
94 94
95 - {% render_field form.initial_view_date class='form-control date-picker' %} 95 + {% render_field form.initial_view_date class='form-control datetime-picker' %}
96 96
97 <span id="helpBlock" class="help-block">{{ form.initial_view.help_text }}</span> 97 <span id="helpBlock" class="help-block">{{ form.initial_view.help_text }}</span>
98 98
@@ -136,7 +136,7 @@ @@ -136,7 +136,7 @@
136 <div class="form-group{% if form.has_error %} has-error {% endif %}"> 136 <div class="form-group{% if form.has_error %} has-error {% endif %}">
137 <label for="{{ form.end_view_date.auto_id }}">{{ form.end_view_date.label }}</label> 137 <label for="{{ form.end_view_date.auto_id }}">{{ form.end_view_date.label }}</label>
138 138
139 - {% render_field form.end_view_date class='form-control date-picker' %} 139 + {% render_field form.end_view_date class='form-control datetime-picker' %}
140 140
141 <span id="helpBlock" class="help-block">{{ form.end_view.help_text }}</span> 141 <span id="helpBlock" class="help-block">{{ form.end_view.help_text }}</span>
142 142