Commit 605b89e2 authored by Vasyl Bodnaruk's avatar Vasyl Bodnaruk

add functional for adding new News

parent 8aeeaf06
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</form> </form>
</div> </div>
<div> <div>
<a href="/" class="btn btn-primary">Add</a> <a href="{% url 'add_news' %}" class="btn btn-primary">Add</a>
<button class="js-delete-items btn btn-danger"> <button class="js-delete-items btn btn-danger">
<span>Delete(</span><span class="actions-counter">0</span><span>)</span> <span>Delete(</span><span class="actions-counter">0</span><span>)</span>
</button> </button>
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
<thead class="thead-inverse"> <thead class="thead-inverse">
<tr> <tr>
<th> <th>
<span><input id="select-all" type="checkbox"></span>
<span>Title</span> <span>Title</span>
</th> </th>
<th><a href="?order_by=media_id{% if request.GET.order_by == 'media_id' and request.GET.reverse != '1' %}&amp;reverse=1{% endif %}"> <th><a href="?order_by=media_id{% if request.GET.order_by == 'media_id' and request.GET.reverse != '1' %}&amp;reverse=1{% endif %}">
......
...@@ -30,7 +30,6 @@ class NewsUpdate(forms.Form): ...@@ -30,7 +30,6 @@ class NewsUpdate(forms.Form):
if self.data['region']: if self.data['region']:
news.region_id = self.data['region'] news.region_id = self.data['region']
if self.data['date']: if self.data['date']:
print(self.data['date'])
news.publish_date = datetime.strptime(self.data['date'], '%Y-%m-%d') news.publish_date = datetime.strptime(self.data['date'], '%Y-%m-%d')
if self.data['tags']: if self.data['tags']:
......
import json import json
from datetime import datetime
from django.db import models from django.db import models
from .wp import WpEsiMedia, WpEsiEntity, WpEsiType, WpEsiRegion, WpEsiNewsEntity, WpEsiNews, WpEsiRadar, WpEsiIndustry, \ from .wp import WpEsiMedia, WpEsiEntity, WpEsiType, WpEsiRegion, WpEsiNewsEntity, WpEsiNews, WpEsiRadar, WpEsiIndustry, \
WpEsiFunction, WpEsiTechnology, WpEsiTag WpEsiFunction, WpEsiTechnology, WpEsiTag
...@@ -6,17 +7,17 @@ from .wp import WpEsiMedia, WpEsiEntity, WpEsiType, WpEsiRegion, WpEsiNewsEntity ...@@ -6,17 +7,17 @@ from .wp import WpEsiMedia, WpEsiEntity, WpEsiType, WpEsiRegion, WpEsiNewsEntity
class News(models.Model): class News(models.Model):
title = models.CharField(max_length=255) title = models.CharField(max_length=255, default=None, null=True, blank=True)
url = models.TextField(max_length=2083) url = models.TextField(max_length=2083, default=None, null=True, blank=True)
description = models.TextField() description = models.TextField(default=None, null=True, blank=True)
media_id = models.IntegerField() media_id = models.IntegerField(default=None, null=True, blank=True)
type_id = models.IntegerField() type_id = models.IntegerField(default=None, null=True, blank=True)
region_id = models.IntegerField() region_id = models.IntegerField(default=None, null=True, blank=True)
post_id = models.BigIntegerField() post_id = models.BigIntegerField(default=None, null=True, blank=True)
publish_date = models.DateTimeField() publish_date = models.DateTimeField(default=datetime.now, null=True, blank=True)
record_date = models.DateTimeField() record_date = models.DateTimeField(default=None, null=True, blank=True)
company_id = models.BigIntegerField() company_id = models.BigIntegerField(default=None, null=True, blank=True)
is_accepted = models.BooleanField(default=False) is_accepted = models.BooleanField(default=False)
radar_id = models.BigIntegerField(default=None, null=True, blank=True) radar_id = models.BigIntegerField(default=None, null=True, blank=True)
......
from django.conf.urls import url from django.conf.urls import url
from .views import ListNewsView, EditNewsView, ViewNewsView from .views import ListNewsView, EditNewsView, ViewNewsView, add
from .autocomplete import * from .autocomplete import *
...@@ -7,5 +7,6 @@ urlpatterns = [ ...@@ -7,5 +7,6 @@ urlpatterns = [
url(r'^$', ListNewsView.as_view(), name='list_news'), url(r'^$', ListNewsView.as_view(), name='list_news'),
url(r'^(?P<id>[0-9]+)$', EditNewsView.as_view(), name='edit_news'), url(r'^(?P<id>[0-9]+)$', EditNewsView.as_view(), name='edit_news'),
url(r'^view/(?P<id>[0-9]+)$', ViewNewsView.as_view(), name='view_news'), url(r'^view/(?P<id>[0-9]+)$', ViewNewsView.as_view(), name='view_news'),
url(r'^auto/(?P<slug>\w+)$', auto, name='auto') url(r'^auto/(?P<slug>\w+)$', auto, name='auto'),
url(r'^add/$', add, name='add_news')
] ]
\ No newline at end of file
...@@ -95,7 +95,6 @@ class EditNewsView(DetailView): ...@@ -95,7 +95,6 @@ class EditNewsView(DetailView):
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
radar = request.POST.get('cancel') radar = request.POST.get('cancel')
print(radar)
form = NewsUpdate(request.POST) form = NewsUpdate(request.POST)
if form.is_valid(): if form.is_valid():
form.update() form.update()
...@@ -127,3 +126,8 @@ class ViewNewsView(DetailView): ...@@ -127,3 +126,8 @@ class ViewNewsView(DetailView):
news.export_news() news.export_news()
return HttpResponseRedirect(reverse('view_news', kwargs={'id': export_news})) return HttpResponseRedirect(reverse('view_news', kwargs={'id': export_news}))
def add(request):
news = News()
news.save()
return HttpResponseRedirect(reverse('edit_news', kwargs={'id': news.id}))
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment