Commit 7f23cb75 authored by Vasyl Bodnaruk's avatar Vasyl Bodnaruk

added functional for autocomplete for edit view

parent c88860f3
...@@ -61,9 +61,8 @@ ...@@ -61,9 +61,8 @@
<div class="col-6"> <div class="col-6">
<input <input
type="text" type="text"
multiple
id="radar" id="radar"
data-url="{% url 'radar' news.id %}" data-url="{% url 'auto' slug='radar' %}"
data-load-once="true" data-load-once="true"
class="multiselect" class="multiselect"
name="radar"/> name="radar"/>
...@@ -78,7 +77,7 @@ ...@@ -78,7 +77,7 @@
type="text" type="text"
id="industry" id="industry"
class="multiselect" class="multiselect"
data-url="json/industry.json" data-url="{% url 'auto' slug='industry' %}"
data-load-once="true" data-load-once="true"
name="industry"/> name="industry"/>
</div> </div>
...@@ -92,7 +91,7 @@ ...@@ -92,7 +91,7 @@
type="text" type="text"
id="function" id="function"
class="multiselect" class="multiselect"
data-url="json/function.json" data-url="{% url 'auto' slug='function' %}"
data-load-once="true" data-load-once="true"
name="function"/> name="function"/>
</div> </div>
...@@ -108,7 +107,7 @@ ...@@ -108,7 +107,7 @@
type="text" type="text"
id="media" id="media"
class="multiselect" class="multiselect"
data-url="json/media.json" data-url="{% url 'auto' slug='media' %}"
data-load-once="true" data-load-once="true"
name="media"/> name="media"/>
</div> </div>
...@@ -127,7 +126,7 @@ ...@@ -127,7 +126,7 @@
type="text" type="text"
id="technology" id="technology"
class="multiselect" class="multiselect"
data-url="json/technology.json" data-url="{% url 'auto' slug='technology' %}"
data-load-once="true" data-load-once="true"
name="technology"/> name="technology"/>
</div> </div>
...@@ -141,7 +140,7 @@ ...@@ -141,7 +140,7 @@
type="text" type="text"
id="type" id="type"
class="multiselect" class="multiselect"
data-url="json/type.json" data-url="{% url 'auto' slug='type' %}"
data-load-once="true" data-load-once="true"
name="type"/> name="type"/>
</div> </div>
...@@ -155,7 +154,7 @@ ...@@ -155,7 +154,7 @@
type="text" type="text"
id="region" id="region"
class="multiselect" class="multiselect"
data-url="json/region.json" data-url="{% url 'auto' slug='region' %}"
data-load-once="true" data-load-once="true"
name="region"/> name="region"/>
</div> </div>
...@@ -179,7 +178,8 @@ ...@@ -179,7 +178,8 @@
multiple multiple
id="tag" id="tag"
class="multiselect" class="multiselect"
data-url="json/tags.json" data-initial-value='[{"text": "Algeria", "value" : "Algeria"}, {"text": "Angola", "value" : "Angola"}]'
data-url="{% url 'auto' slug='tags' %}"
data-load-once="true" data-load-once="true"
name="tags"/> name="tags"/>
</div> </div>
......
import json
from django.http import JsonResponse
from .models import WpEsiRadar, WpEsiIndustry, WpEsiFunction, WpEsiMedia, WpEsiTechnology, WpEsiType, WpEsiRegion, \
WpEsiTag
def auto(request, slug):
print(slug)
if slug == 'radar':
return select(WpEsiRadar)
if slug == 'industry':
return select(WpEsiIndustry)
if slug == 'function':
return select(WpEsiFunction)
if slug == 'media':
return select(WpEsiMedia)
if slug == 'technology':
return select(WpEsiTechnology)
if slug == 'type':
return select(WpEsiType)
if slug == 'region':
return select(WpEsiRegion)
if slug == 'tags':
return select(WpEsiTag)
def select(obj):
d = [{'text': i.name, 'value': i.id} for i in obj.objects.all()]
return JsonResponse(d, safe=False)
\ No newline at end of file
from django.db import models from django.db import models
from .wp import WpEsiMedia, WpEsiEntity, WpEsiType, WpEsiRegion, WpEsiNewsEntity, WpEsiNews from .wp import WpEsiMedia, WpEsiEntity, WpEsiType, WpEsiRegion, WpEsiNewsEntity, WpEsiNews
class News(models.Model): class News(models.Model):
title = models.CharField(max_length=255) title = models.CharField(max_length=255)
...@@ -16,6 +17,12 @@ class News(models.Model): ...@@ -16,6 +17,12 @@ class News(models.Model):
company_id = models.BigIntegerField() company_id = models.BigIntegerField()
is_accepted = models.BooleanField(default=False) is_accepted = models.BooleanField(default=False)
radar_id = models.BigIntegerField(default=None, null=True, blank=True)
industry_id = models.BigIntegerField(default=None, null=True, blank=True)
function_id = models.BigIntegerField(default=None, null=True, blank=True)
technology_id = models.BigIntegerField(default=None, null=True, blank=True)
tags_id = models.CharField(max_length=255, default=None, null=True, blank=True)
class Meta: class Meta:
db_table = 'wp_esi_news_accept' db_table = 'wp_esi_news_accept'
......
from django.conf.urls import url from django.conf.urls import url
from .views import ListNewsView, EditNewsView, ViewNewsView, radar from .views import ListNewsView, EditNewsView, ViewNewsView
from .autocomplete import *
urlpatterns = [ 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'^radar/(?P<id>[0-9]+)$', radar, name='radar') url(r'^auto/(?P<slug>\w+)$', auto, name='auto')
] ]
\ No newline at end of file
...@@ -104,11 +104,3 @@ class ViewNewsView(DetailView): ...@@ -104,11 +104,3 @@ 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 radar(request, id):
d = [{"text": "Algeria", "value" : "Algeria"},
{"text": "Angola", "value" : "Angola"},
{"text": "Angola", "value" : "as"},
{"text": "Angola", "value" : "dsda"},
{"text": "Angola", "value" : "aasdadsd"}]
return JsonResponse(d, safe=False)
\ 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