Download as
Browse Code »

Commit 375ce49e5bf059905e9dd3b780e05cbf3aafc365

Authored by ifac0
2 parents 692a2510 6ad20d2a
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

correção de conflito

Showing 2 changed files with 45 additions and 47 deletions   Show diff stats
links/models.py
  Diff comments   View file @375ce49
1   -# from django.db import models
2   -# from courses.models import Material
3   -# # Create your models here.
4   -# class Link(Material,models.Model):
5   -# name = models.CharField(max_lenght = 100)
6   -# link = models.UrlField()
7   -# description = models.CharField(max_lenght = 200)
8   -# class Meta:
9   -# verbose_name = 'Link'
10   -# verbose_name_plural = "Links"
11   -# def __str__(self):
12   -# return str(self.name)
13   -#
14   -#
15   -#
  1 +
  2 +from django.db import models
  3 +from courses.models import Material
  4 +# Create your models here.
  5 +class Link(models.Model):
  6 + name = models.CharField(max_length=100)
  7 + link = models.URLField()
  8 + description = models.CharField(max_length=200)
  9 + class Meta:
  10 + verbose_name = 'Link'
  11 + verbose_name_plural = "Links"
  12 + def __str__(self):
  13 + return str(self.name)
... ...
links/views.py
  Diff comments   View file @375ce49
1   -# from django.shortcuts import render
2   -# from django.views import generic
3   -# from django.core.urlresolvers import reverse_lazy
4   -# from django.contrib import messages
5   -# from django.utils.translation import ugettext_lazy as _
6   -#
7   -#
8   -# from .models import Link
9   -# from .forms import *
10   -#
11   -# # Create your views here.
12   -# class CreateLink(generic.CreateView):
13   -# template_name = 'links/'
14   -# form_class = CreateLinkForm
15   -# success_url = reverse_lazy()
16   -# def form_valid(self, form):
17   -# form.save()
18   -# messages.success(self.request, _('Link created successfully!'))
19   -# return super(CreateLink, self).form_valid(form)
20   -#
21   -#
22   -# class DeleteLink(generic.DeleteView):
23   -#
24   -# class UpdateLink(generic.UpdateView):
25   -# template_name = 'links/'
26   -# form_class = UpdateLinkForm
27   -# success_url = reverse_lazy()
28   -# def form_valid(self, form):
29   -# form.save()
30   -# messages.success(self.request, _('Link updated successfully!'))
31   -#
32   -# return super(UpdateLink, self).form_valid(form)
  1 +from django.shortcuts import render
  2 +from django.views import generic
  3 +from django.core.urlresolvers import reverse_lazy
  4 +from django.contrib import messages
  5 +from django.utils.translation import ugettext_lazy as _
  6 +
  7 +
  8 +from .models import Link
  9 +from .forms import *
  10 +
  11 +# Create your views here.
  12 +class CreateLink(generic.CreateView):
  13 + template_name = 'links/'
  14 + form_class = CreateLinkForm
  15 + success_url = reverse_lazy()
  16 + def form_valid(self, form):
  17 + form.save()
  18 + messages.success(self.request, _('Link created successfully!'))
  19 + return super(CreateLink, self).form_valid(form)
  20 +
  21 +
  22 +class DeleteLink(generic.DeleteView):
  23 +
  24 +class UpdateLink(generic.UpdateView):
  25 + template_name = 'links/'
  26 + form_class = UpdateLinkForm
  27 + success_url = reverse_lazy()
  28 + def form_valid(self, form):
  29 + form.save()
  30 + messages.success(self.request, _('Link updated successfully!'))
  31 +
  32 + return super(UpdateLink, self).form_valid(form)
... ...