Merge branch 'refactoring' of https://github.com/amadeusproject/amadeuslms into refactoring

Zambom
2 parents d80463e5 94ee78c5
Showing 8 changed files with 53 additions and 5 deletions Show diff stats
amadeus/settings.py
amadeus/static/img/no_image.jpg
amadeus/templates/base.html
amadeus/urls.py
news/models.py
news/templates/news/list.html
news/urls.py
news/views.py
@@ -81,6 +81,7 @@ INSTALLED_APPS = [
     'api',
     'reports',
     'webconference',
+    'news',
 ]
  
 MIDDLEWARE_CLASSES = [
@@ -166,6 +166,7 @@
                             <ul class="dropdown-menu" role="menu">
                                 <li><a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
                                 <li><a href="{% url 'categories:index' %}">{% trans 'Manage Categories' %}</a></li>
+																<li><a href="">{% trans 'Manage News' %}</a></li>
                                 <li class="dropdown-accordion" data-accordion="#system_accordion">
                                     <div class="panel-group" id="system_accordion">
                                         <div class="panel panel-default">
@@ -43,6 +43,7 @@ urlpatterns = [
     url(r'^links/', include('links.urls', namespace='links')),
     url(r'^pdf_files/', include('pdf_file.urls', namespace='pdf_files')),
     url(r'^webconferences/', include('webconference.urls', namespace = 'webconferences')),
+    url(r'^news/', include('news.urls', namespace='news')),
     url(r'^i18n/', include('django.conf.urls.i18n')),
     #API
     url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
@@ -15,7 +15,13 @@ def validate_img_extension(value):
 			raise ValidationError(_('File not supported.'))
  
 class News(models.Model):
-    title = models.CharField( _("Name"), unique = True,max_length= 200)
-    slug = AutoSlugField(_("Slug"),populate_from='title',unique=True)
-    image = models.ImageField(verbose_name = _('News Image'), upload_to = 'news/', validators = [validate_img_extension])
-	content = models.TextField(_('Description'))
+	title = models.CharField( _("Name"), unique = True,max_length= 200)
+	slug = AutoSlugField(_("Slug"),populate_from='title',unique=True)
+	image = models.ImageField(verbose_name = _('News Image'), upload_to = 'news/', validators = [validate_img_extension])
+	content = models.TextField(_('News Content'))
+	class Meta:
+		verbose_name = _('News')
+		verbose_name_plural = _('News')
+
+	def __str__(self):
+		return self.title
@@ -0,0 +1,7 @@
+from django.conf.urls import url
+from . import views
+
+urlpatterns = [
+	url(r'^$', views.ListNewsView.as_view(), name='manage_news'),
+
+]
 from django.shortcuts import render
+from django.views import generic
+from django.contrib.auth.mixins import LoginRequiredMixin
+from log.models import Log
+from log.mixins import LogMixin
+from django.core.urlresolvers import reverse, reverse_lazy
  
-# Create your views here.
+from .models import News
+from .forms import NewsForm
+
+class ListNewsView(LoginRequiredMixin,LogMixin,generic.ListView):
+    login_url = reverse_lazy("users:login")
+    redirect_field_name = 'next'
+
+    template_name = 'news/list.html'
+    context_object_name = "news"
+    paginate_by = 10
+
+    def get_queryset(self):
+        news = News.objects.all()
+        return news
+
+class CreateNewsView(LoginRequiredMixin,LogMixin,generic.edit.CreateView):
+    login_url = reverse_lazy("users:login")
+    redirect_field_name = 'next'
+
+
+    template_name = 'news/_form.html'
+    form_class = NewsForm
+
+    def form_invalid(self, form):
+    	context = super(CreateNewsView, self).form_invalid(form)
+    	context.status_code = 400
+
+    	return context
...	...	@@ -81,6 +81,7 @@ INSTALLED_APPS = [
81	81	'api',
82	82	'reports',
83	83	'webconference',
	84	+ 'news',
84	85	]
85	86
86	87	MIDDLEWARE_CLASSES = [
...	...
...	...	@@ -166,6 +166,7 @@
166	166	<ul class="dropdown-menu" role="menu">
167	167	<li><a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
168	168	<li><a href="{% url 'categories:index' %}">{% trans 'Manage Categories' %}</a></li>
	169	+ <li><a href="">{% trans 'Manage News' %}</a></li>
169	170	<li class="dropdown-accordion" data-accordion="#system_accordion">
170	171	<div class="panel-group" id="system_accordion">
171	172	<div class="panel panel-default">
...	...
...	...	@@ -43,6 +43,7 @@ urlpatterns = [
43	43	url(r'^links/', include('links.urls', namespace='links')),
44	44	url(r'^pdf_files/', include('pdf_file.urls', namespace='pdf_files')),
45	45	url(r'^webconferences/', include('webconference.urls', namespace = 'webconferences')),
	46	+ url(r'^news/', include('news.urls', namespace='news')),
46	47	url(r'^i18n/', include('django.conf.urls.i18n')),
47	48	#API
48	49	url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
...	...
...	...	@@ -15,7 +15,13 @@ def validate_img_extension(value):
15	15	raise ValidationError(_('File not supported.'))
16	16
17	17	class News(models.Model):
18		- title = models.CharField( _("Name"), unique = True,max_length= 200)
19		- slug = AutoSlugField(_("Slug"),populate_from='title',unique=True)
20		- image = models.ImageField(verbose_name = _('News Image'), upload_to = 'news/', validators = [validate_img_extension])
21		- content = models.TextField(_('Description'))
	18	+ title = models.CharField( _("Name"), unique = True,max_length= 200)
	19	+ slug = AutoSlugField(_("Slug"),populate_from='title',unique=True)
	20	+ image = models.ImageField(verbose_name = _('News Image'), upload_to = 'news/', validators = [validate_img_extension])
	21	+ content = models.TextField(_('News Content'))
	22	+ class Meta:
	23	+ verbose_name = _('News')
	24	+ verbose_name_plural = _('News')
	25	+
	26	+ def __str__(self):
	27	+ return self.title
...	...
...	...	@@ -0,0 +1,7 @@
	1	+from django.conf.urls import url
	2	+from . import views
	3	+
	4	+urlpatterns = [
	5	+ url(r'^$', views.ListNewsView.as_view(), name='manage_news'),
	6	+
	7	+]
...	...
1	1	from django.shortcuts import render
	2	+from django.views import generic
	3	+from django.contrib.auth.mixins import LoginRequiredMixin
	4	+from log.models import Log
	5	+from log.mixins import LogMixin
	6	+from django.core.urlresolvers import reverse, reverse_lazy
2	7
3		-# Create your views here.
	8	+from .models import News
	9	+from .forms import NewsForm
	10	+
	11	+class ListNewsView(LoginRequiredMixin,LogMixin,generic.ListView):
	12	+ login_url = reverse_lazy("users:login")
	13	+ redirect_field_name = 'next'
	14	+
	15	+ template_name = 'news/list.html'
	16	+ context_object_name = "news"
	17	+ paginate_by = 10
	18	+
	19	+ def get_queryset(self):
	20	+ news = News.objects.all()
	21	+ return news
	22	+
	23	+class CreateNewsView(LoginRequiredMixin,LogMixin,generic.edit.CreateView):
	24	+ login_url = reverse_lazy("users:login")
	25	+ redirect_field_name = 'next'
	26	+
	27	+
	28	+ template_name = 'news/_form.html'
	29	+ form_class = NewsForm
	30	+
	31	+ def form_invalid(self, form):
	32	+ context = super(CreateNewsView, self).form_invalid(form)
	33	+ context.status_code = 400
	34	+
	35	+ return context
...	...