Commit 15d584fd authored by Vasyl Bodnaruk's avatar Vasyl Bodnaruk

finished add functional for added tags to edit view if they exist.

Refactor code, add some logic ro template
parent 60e6b409
...@@ -62,7 +62,9 @@ ...@@ -62,7 +62,9 @@
<input <input
type="text" type="text"
id="radar" id="radar"
{% if news.get_radar %}
data-initial-value='[{"text": "{{ news.get_radar }}", "value" : "{{ news.get_radar.id }}"}]' data-initial-value='[{"text": "{{ news.get_radar }}", "value" : "{{ news.get_radar.id }}"}]'
{% endif %}
data-url="{% url 'auto' slug='radar' %}" data-url="{% url 'auto' slug='radar' %}"
data-load-once="true" data-load-once="true"
class="multiselect singleInputDynamic" class="multiselect singleInputDynamic"
...@@ -78,7 +80,9 @@ ...@@ -78,7 +80,9 @@
type="text" type="text"
id="industry" id="industry"
class="multiselect" class="multiselect"
{% if news.get_industry %}
data-initial-value='[{"text": "{{ news.get_industry }}", "value" : "{{ news.get_industry.id }}"}]' data-initial-value='[{"text": "{{ news.get_industry }}", "value" : "{{ news.get_industry.id }}"}]'
{% endif %}
data-url="{% url 'auto' slug='industry' %}" data-url="{% url 'auto' slug='industry' %}"
data-load-once="true" data-load-once="true"
name="industry"/> name="industry"/>
...@@ -93,7 +97,9 @@ ...@@ -93,7 +97,9 @@
type="text" type="text"
id="function" id="function"
class="multiselect" class="multiselect"
{% if news.get_function %}
data-initial-value='[{"text": "{{ news.get_function }}", "value" : "{{ news.get_function.id }}"}]' data-initial-value='[{"text": "{{ news.get_function }}", "value" : "{{ news.get_function.id }}"}]'
{% endif %}
data-url="{% url 'auto' slug='function' %}" data-url="{% url 'auto' slug='function' %}"
data-load-once="true" data-load-once="true"
name="function"/> name="function"/>
...@@ -110,7 +116,9 @@ ...@@ -110,7 +116,9 @@
type="text" type="text"
id="media" id="media"
class="multiselect" class="multiselect"
{% if news.get_media %}
data-initial-value='[{"text": "{{ news.get_media }}", "value" : "{{ news.get_media.id }}"}]' data-initial-value='[{"text": "{{ news.get_media }}", "value" : "{{ news.get_media.id }}"}]'
{% endif %}
data-url="{% url 'auto' slug='media' %}" data-url="{% url 'auto' slug='media' %}"
data-load-once="true" data-load-once="true"
name="media"/> name="media"/>
...@@ -130,7 +138,9 @@ ...@@ -130,7 +138,9 @@
type="text" type="text"
id="technology" id="technology"
class="multiselect" class="multiselect"
{% if news.get_technology %}
data-initial-value='[{"text": "{{ news.get_technology }}", "value" : "{{ news.get_technology.id }}"}]' data-initial-value='[{"text": "{{ news.get_technology }}", "value" : "{{ news.get_technology.id }}"}]'
{% endif %}
data-url="{% url 'auto' slug='technology' %}" data-url="{% url 'auto' slug='technology' %}"
data-load-once="true" data-load-once="true"
name="technology"/> name="technology"/>
...@@ -145,7 +155,9 @@ ...@@ -145,7 +155,9 @@
type="text" type="text"
id="type" id="type"
class="multiselect" class="multiselect"
{% if news.get_type %}
data-initial-value='[{"text": "{{ news.get_type }}", "value" : "{{ news.get_type.id }}"}]' data-initial-value='[{"text": "{{ news.get_type }}", "value" : "{{ news.get_type.id }}"}]'
{% endif %}
data-url="{% url 'auto' slug='type' %}" data-url="{% url 'auto' slug='type' %}"
data-load-once="true" data-load-once="true"
name="type"/> name="type"/>
...@@ -160,7 +172,9 @@ ...@@ -160,7 +172,9 @@
type="text" type="text"
id="region" id="region"
class="multiselect" class="multiselect"
{% if news.get_region %}
data-initial-value='[{"text": "{{ news.get_region }}", "value" : "{{ news.get_region.id }}"}]' data-initial-value='[{"text": "{{ news.get_region }}", "value" : "{{ news.get_region.id }}"}]'
{% endif %}
data-url="{% url 'auto' slug='region' %}" data-url="{% url 'auto' slug='region' %}"
data-load-once="true" data-load-once="true"
name="region"/> name="region"/>
...@@ -177,7 +191,6 @@ ...@@ -177,7 +191,6 @@
</div> </div>
<!-- Tag --> <!-- Tag -->
{{ news.get_tags }}
<div class="form-group row"> <div class="form-group row">
<label for="tag" class="offset-1 col-2 col-form-label">Tag</label> <label for="tag" class="offset-1 col-2 col-form-label">Tag</label>
<div class="col-6"> <div class="col-6">
...@@ -186,7 +199,9 @@ ...@@ -186,7 +199,9 @@
multiple multiple
id="tag" id="tag"
class="multiselect" class="multiselect"
data-initial-value='[{"text": "Algeria", "value" : "Algeria"}, {"text": "Angola", "value" : "Angola"}]' {% if news.get_tags_json %}
data-initial-value='{{ news.get_tags_json }}'
{% endif %}
data-url="{% url 'auto' slug='tags' %}" data-url="{% url 'auto' slug='tags' %}"
data-load-once="true" data-load-once="true"
name="tags"/> name="tags"/>
......
...@@ -33,10 +33,14 @@ class News(models.Model): ...@@ -33,10 +33,14 @@ class News(models.Model):
def get_tags(self): def get_tags(self):
if self.tags_id: if self.tags_id:
# tags = json.loads(self.tags_id, encoding='utf-8') tags = json.loads(self.tags_id)
return self.tags_id return WpEsiTechnology.objects.filter(id__in=tags)
# return self.tags_id.split(',') return None
# return WpEsiTechnology.objects.filter(id__in=tags)
def get_tags_json(self):
tags = self.get_tags()
if tags:
return json.dumps([{'text': i.name, 'value': i.id} for i in tags])
return None return None
def get_technology(self): def get_technology(self):
......
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