Fixing tag issues in conversation card and edit conversation

cidadedemocratica · Nov 28, 2018 · e3a9926 · e3a9926
1 parent 90c3dc1
commit e3a9926
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 20 deletions.
diff --git a/src/ej_conversations/forms.py b/src/ej_conversations/forms.py
@@ -57,8 +57,11 @@ def save_all(self, author, board=None, **kwargs):
         for k, v in kwargs.items():
             setattr(conversation, k, v)
         conversation.save()
-
+        print(self.cleaned_data['tags'])
         # Save tags on the database
+        tags = conversation.tags.all()
+        if tags:
+            conversation.tags = None
         for tag in self.cleaned_data['tags']:
             conversation.tags.add(tag)
 

diff --git a/src/ej_conversations/jinja2/ej/role/conversation-card.jinja2 b/src/ej_conversations/jinja2/ej/role/conversation-card.jinja2
@@ -2,10 +2,9 @@
     <div class="ConversationCard">
         <div class="ConversationTags">
             <i class="fa fa-tags"></i>
-              {% if tags %}
-                {% for tag in tags %}
-                  {{ tag }}
-                {% endfor %}
+              {% if tag %}
+                {# Only conversation first tag is shown in card to prevent overflow #}
+                {{ tag }}
               {% else %}
                 {{ _('Conversation') }}
               {% endif %}

diff --git a/src/ej_conversations/jinja2/ej_conversations/create.jinja2 b/src/ej_conversations/jinja2/ej_conversations/create.jinja2
@@ -54,9 +54,6 @@
 
                     <p>{{ form.text }}</p>
 
-                    <div class="Conversation-edit">
-                        <b>{{ _('Edit Conversation') }}</b>
-                    </div>
                 </div>
                 <div class="ConversationDetail-arrow"></div>
             </div>

diff --git a/src/ej_conversations/jinja2/ej_conversations/edit.jinja2 b/src/ej_conversations/jinja2/ej_conversations/edit.jinja2
@@ -19,19 +19,14 @@
             </span>
           </div>
 
-          {% if conversation.tags.count() > 0 %}
-              {% set tags = (conversation.tags.all()[0]|string).title() %}
-          {% else %}
-              {% set tags = 'Tags' %}
-          {% endif %}
-
-          <input type="hidden" name="tags" value="{{ tags }}" />
 
           <div class="ConversationDetail">
               <div class="ConversationDetail-banner">
-                  <div class="ConversationTags"><i class="fa fa-tags"></i>
-                    {{ tags }}
-                  </div>
+                  <div class="ConversationTags">
+                    <div class="ConversationField">
+                        <i class="fa fa-tags"></i><input name="tags" value="{{ tags }}" />
+                    </div>
+                 </div>
 
                   <p><textarea onfocus="this.style.height = (this.scrollHeight) + 'px'" onkeyup="this.style.height = (this.scrollHeight) + 'px'" class="Conversation-edit-field" name="text" required id="id_text">{{ conversation.text }}</textarea></p>
 

diff --git a/src/ej_conversations/roles.py b/src/ej_conversations/roles.py
@@ -19,10 +19,11 @@ def conversation_card(conversation, request=None, url=None, **kwargs):
 
     user = getattr(request, 'user', None)
     can_moderate = user.has_perm('ej.can_moderate_conversation', conversation)
+    tag = conversation.tags.first()  # only first is shown in card to prevent overflow
     return {
         'conversation': conversation,
         'url': url or conversation.get_absolute_url(),
-        'tags': conversation.tags.all(),
+        'tag': tag,
         'n_comments': conversation.approved_comments.count(),
         'n_votes': conversation.vote_count(),
         'n_followers': conversation.followers.count(),

diff --git a/src/ej_conversations/routes/admin.py b/src/ej_conversations/routes/admin.py
@@ -43,14 +43,16 @@ def get_conversation_edit_context(request, conversation):
             instance=conversation,
         )
         if form.is_valid():
-            form.instance.save()
+            form.save()
             return redirect(conversation.get_absolute_url() + 'moderate/')
     else:
         form = forms.ConversationForm(instance=conversation)
+    tags = list(map(str, conversation.tags.all()))
 
     return {
         'form': form,
         'conversation': conversation,
+        'tags': ",".join(tags),
         'can_promote_conversation': request.user.has_perm('can_publish_promoted'),
         'comments': list(conversation.comments.filter(status='pending')),
         'manage_stereotypes_url': conversation.get_absolute_url() + 'stereotypes/',