merge with master two

2016-01-19 11:09:47 +01:00
parent 326dd04ae7
commit d16f1ccd08
7 changed files with 44 additions and 55 deletions
--- a/app/views/debates/_form.html.erb
+++ b/app/views/debates/_form.html.erb
@@ -20,12 +20,10 @@
        <% @category_tags.each do |tag| %>
          <a class="js-add-tag-link"><%= tag.name %></a>
        <% end %>
-        <hr widht="30%" align="left">
        <%= f.label :tag_list, t("debates.form.tag_district_label") %> 
-        <% @district_tags.each do |tag| %>
-          <a class="js-add-tag-link"><%= tag.name %></a>
+        <% @district_select.each do |g| %>
+          <a class="js-add-tag-link"><%= g.name%></a>
        <% end %>
-        
      </span>
      <%= f.text_field :tag_list, value: @debate.tag_list.to_s, label: false, placeholder: t("debates.form.tags_placeholder"), class: 'js-tag-list' %>
    </div>