delete generation

kiryanenko · Nov 26, 2016 · 44a4aad · 44a4aad
1 parent 090982a
commit 44a4aad
Show file tree

Hide file tree

Showing 9 changed files with 205 additions and 268 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/Gemfile b/Gemfile
@@ -58,6 +58,4 @@ gem 'pg_search'
 gem 'will_paginate'
 gem 'will_paginate-bootstrap'
 gem 'rmagick'
-gem 'rails_12factor', group: :production
-
-ruby "2.1.2"
+gem 'rails_12factor', group: :production
diff --git a/app/controllers/generations_controller.rb b/app/controllers/generations_controller.rb
@@ -140,7 +140,7 @@ def create
   def destroy
     @generation.destroy
     respond_to do |format|
-      format.html { redirect_to generations_url, notice: 'Generation was successfully destroyed.' }
+      format.html { redirect_to '/', notice: 'Сгенерированные варианты были успешно удалены.' }
       format.json { head :no_content }
     end
   end

diff --git a/app/views/generations/_list_item.erb b/app/views/generations/_list_item.erb
@@ -0,0 +1,21 @@
+<a href="<%= generation_path generation %>" class="list-group-item list-group-item-action">
+  <button href="javascript: document.getElementById('form-destroy_generation_<%= generation.id %>').submit()" class="close"
+     aria-hidden="true" data-toggle="confirmation" data-placement="left"
+     title="Вы уверены, что хотите удалить эти сгенерированные варианты?">×</button>
+  <%= form_tag generation_path(generation), method: 'delete', id: 'form-destroy_generation_' + generation.id.to_s do end %>
+
+  <h5 style="margin: 0px;">
+    <%= generation.title %>
+  </h5>
+
+  <table width="100%">
+    <tr>
+      <td><p class="list-group-item-buttom">
+        <small><%= generation.variants.size %> вариантов</small>
+      </p></td>
+      <td width="80px" valign="bottom">
+        <span class="pull-right text-muted small"><em><%= generation.updated_at.to_formatted_s(:short) %></em></span>
+      </td>
+    </tr>
+  </table>
+</a>
diff --git a/app/views/generations/my_generations.html.erb b/app/views/generations/my_generations.html.erb
@@ -9,12 +9,7 @@
 <% else %>
     <div class="list-group">
       <% @generations.each do |g| %>
-          <a href="/generations/<%= g.id %>" class="list-group-item list-group-item-action">
-            <span class="pull-right text-muted small"><em><%= g.updated_at.to_formatted_s(:short) %></em></span>
-            <h4 class="list-group-item-heading"><%= g.title %><br>
-              <small>Сгенерироваано <%= g.variants.size %> вариантов</small>
-            </h4>
-          </a>
+          <%= render 'generations/list_item', generation: g %>
       <% end %>
     </div>
 

diff --git a/app/views/main_page/index.html.erb b/app/views/main_page/index.html.erb
@@ -63,13 +63,7 @@
         <% else %>
             <div class="list-group">
               <% @generations.each do |g| %>
-                  <a href="/generations/<%= g.id %>" class="list-group-item list-group-item-action">
-                    <span class="pull-right text-muted small"><em><%= g.updated_at.to_formatted_s(:short) %></em></span>
-                    <h5 style="margin: 0px;">
-                      <%= g.title %><br>
-                      <small><%= g.variants.size %> вариантов</small>
-                    </h5>
-                  </a>
+                  <%= render 'generations/list_item', generation: g %>
               <% end %>
             </div>
             <a href="/generations/my" class="btn btn-default btn-block">Посмотреть все</a>

diff --git a/app/views/question_cards/_list_item.html.erb b/app/views/question_cards/_list_item.html.erb
@@ -6,10 +6,12 @@
               <a href="<%= edit_question_card_path(card) %>" type="button" class="btn btn-warning btn-circle btn-xs" data-placement="bottom" data-toggle="tooltip" title="Редактировать">
                 <i class="fa fa-edit"></i>
               </a>
-              <a href="javascript: document.getElementById('form-destroy_<%= card.id %>').submit()"
-                 class="btn btn-danger btn-circle btn-xs" aria-hidden="true" data-toggle="confirmation"
-                 data-placement="bottom" title="Вы уверены, что хотите удалить этот билет?">
-                <i class="fa fa-trash-o"></i>
+              <a href="javascript: document.getElementById('form-destroy_card_<%= card.id %>').submit()" aria-hidden="true"
+                 data-toggle="confirmation" data-placement="bottom" title="Вы уверены, что хотите удалить этот билет?">
+                <button type="button" class="btn btn-danger btn-circle btn-xs" data-toggle="tooltip"
+                        data-placement="bottom" title="Удалить" data-trigger="hover">
+                  <i class="fa fa-trash-o"></i>
+                </button>
               </a>
           <% else %>
               <a href="<%= question_card_path card %>/add_to_me" class="btn btn-success btn-circle btn-xs"
@@ -23,7 +25,7 @@
       <% end %>
     </div>
     <h4 class="list-group-item-heading "><%= card.title %></h4>
-    <%= form_tag question_card_path(card), method: 'delete', id: 'form-destroy_' + card.id.to_s do end %>
+    <%= form_tag question_card_path(card), method: 'delete', id: 'form-destroy_card_' + card.id.to_s do end %>
   </td></tr></table>
 
   <p class="list-group-item-text list-group-item-description"><%= card.description %></p>

diff --git a/app/views/tasks/_list_item.html.erb b/app/views/tasks/_list_item.html.erb
@@ -8,7 +8,7 @@
                 <i class="fa fa-edit"></i>
               </a>
 
-              <a href="javascript: document.getElementById('form-destroy_<%= task.id %>').submit()" aria-hidden="true"
+              <a href="javascript: document.getElementById('form-destroy_task_<%= task.id %>').submit()" aria-hidden="true"
                  data-toggle="confirmation" data-placement="bottom" title="Вы уверены, что хотите удалить эту задачу?">
                 <button type="button" class="btn btn-danger btn-circle btn-xs" data-toggle="tooltip"
                         data-placement="bottom" title="Удалить" data-trigger="hover">
@@ -27,7 +27,7 @@
               </a>
           <% end %>
         </div>
-        <%= form_tag task_path(task), method: 'delete', id: 'form-destroy_' + task.id.to_s do end %>
+        <%= form_tag task_path(task), method: 'delete', id: 'form-destroy_task_' + task.id.to_s do end %>
     <% end %>
     <h4 class="list-group-item-heading "><%= task.title %></h4>
   </td></tr></table>

diff --git a/app/views/tasks_groups/_list_item.html.erb b/app/views/tasks_groups/_list_item.html.erb
@@ -8,10 +8,13 @@
                  title="Редактировать">
                 <i class="fa fa-edit"></i>
               </a>
-              <a href="javascript: document.getElementById('form-destroy_<%= group.id %>').submit()"
-                 class="btn btn-danger btn-circle btn-xs" aria-hidden="true" data-toggle="confirmation" data-placement="bottom"
+              <a href="javascript: document.getElementById('form-destroy-tasks_group_<%= group.id %>').submit()"
+                 aria-hidden="true" data-toggle="confirmation" data-placement="bottom"
                  title="Вы уверены, что хотите удалить эту группу задач?">
-                <i class="fa fa-trash-o"></i>
+                <button type="button" class="btn btn-danger btn-circle btn-xs" data-toggle="tooltip"
+                        data-placement="bottom" title="Удалить" data-trigger="hover">
+                  <i class="fa fa-trash-o"></i>
+                </button>
               </a>
           <% else %>
               <a href="<%= tasks_group_path group %>/add_to_me" class="btn btn-success btn-circle"
@@ -22,7 +25,7 @@
       <% end %>
     </div>
     <h4 class="list-group-item-heading"><%= group.title %></h4>
-    <%= form_tag tasks_group_path(group), method: 'delete', id: 'form-destroy_' + group.id.to_s do end %>
+    <%= form_tag tasks_group_path(group), method: 'delete', id: 'form-destroy-tasks_group_' + group.id.to_s do end %>
   </td></tr></table>
 
   <p class="list-group-item-text list-group-item-description"><%= group.description %></p>