Fix double pagination on tags questions (publiclab#8689)

* fixed double pagination on tags questions * fix double pagination * pass tests
reginaalyssa · Oct 16, 2021 · 84ee629 · 84ee629
1 parent b9a6c50
commit 84ee629
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git a/app/views/questions/_new_question.html.erb b/app/views/questions/_new_question.html.erb
@@ -104,15 +104,14 @@
 <% end %>
 </div>
 </div>
-</div>
-
 <div class="text-center">
 <% if @pagy %>
   <%== pagy_bootstrap_nav @pagy %>
 <% else %>
   <%= will_paginate questions, :renderer => WillPaginate::ActionView::BootstrapLinkRenderer unless @unpaginated || questions.empty? %>
 <% end %>
 </div>
+</div>
 
 <style>
 

diff --git a/app/views/tag/show/_tab_content.html.erb b/app/views/tag/show/_tab_content.html.erb
@@ -19,21 +19,21 @@
 
   <% if @node_type == "questions" %>
     <div class="tab-pane active" id="questions">
-      <div class="tab-pane" id="questions-tab">
+      <div id="questions-tab">
         <div class="btn-group text-center">
-          <a href="#asked-tab" class="btn btn-outline-secondary active" data-toggle="tab">Asked</a>
-          <a href="#answered-tab" class="btn btn-outline-secondary" data-toggle="tab">Answered</a>
+          <a id="asked-tab" class="btn btn-outline-secondary active">Asked</a>
+          <a id="answered-tab" class="btn btn-outline-secondary">Answered</a>
         </div>
 
         <div class="tab-content">
-          <div class="tab-pane active" id="asked-tab">
+          <div id="asked-content">
             <%= render partial: "questions/new_question" %>
           </div>
 
-          <div class="tab-pane" id="answered-tab">
-            <% if @answered_questions %>
+          <div id="answered-content">
+                      <% if @answered_questions %>
               <%= render partial: "users/answered" %>
-            <% end %>
+                          <% end %>
           </div>
         </div>
       </div>
@@ -66,6 +66,21 @@
         <%= render partial: "tag/contributors" %>
       </div>
   <% end %>
-  <br />
+  <br>
 
 </div>
+
+<script type="text/javascript">
+  $("#answered-content").hide();
+  $("#asked-content").show();
+  $("#asked-tab").on('click', function() {
+    $("#answered-content").hide();
+    $("#asked-content").show();
+  }
+  )
+$("#answered-tab").on('click', function() {
+    $("#asked-content").hide();
+    $("#answered-content").show();
+}
+  )
+</script>
diff --git a/app/views/users/_answered.html.erb b/app/views/users/_answered.html.erb
@@ -35,12 +35,11 @@
   </script>
   <% end %>
   </div>
-</div>
-
-<div class="text-center">
+  <div class="text-center">
 <% if @pagy %>
   <%== pagy_bootstrap_nav @pagy %>
 <% else %>
   <%= will_paginate @questions, :renderer => WillPaginate::ActionView::BootstrapLinkRenderer unless @unpaginated || @questions.empty? %>
 <% end %>
 </div>
+</div>