fixed confirm form resubmission error

cs169 · Apr 22, 2024 · 15b71fb · 15b71fb
1 parent 46a8388
commit 15b71fb
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/app/controllers/merge_controller.rb b/app/controllers/merge_controller.rb
@@ -7,6 +7,7 @@ def preview
     @from_teacher = Teacher.find(params[:from])
     @into_teacher = Teacher.find(params[:into])
     @result_teacher = merge_teachers(@from_teacher, @into_teacher)
+    render "preview"
   end
 
   def execute

diff --git a/app/views/merge/preview.html.erb b/app/views/merge/preview.html.erb
@@ -54,13 +54,13 @@
 
   <div class="teacher-info">
     <%= tag.div class: 'teacher' do %>
-      <%= render 'teachers/teacher_info', teacher: @from_teacher, render_edit: true, render_delete: false, display_deletion_warning_icon: true, is_show_page: false %>
+      <%= render 'teachers/teacher_info', teacher: @from_teacher, render_edit: true, render_edit_personal: false, render_delete: false, display_deletion_warning_icon: true, is_show_page: false %>
     <% end %>
     <%= tag.div class: 'teacher' do %>
-      <%= render 'teachers/teacher_info', teacher: @into_teacher, render_edit: true, render_delete: false, display_deletion_warning_icon: false, is_show_page: false %>
+      <%= render 'teachers/teacher_info', teacher: @into_teacher, render_edit: true, render_edit_personal: false, render_delete: false, display_deletion_warning_icon: false, is_show_page: false %>
     <% end %>
     <%= tag.div class: 'teacher' do %>
-      <%= render 'teachers/teacher_info', teacher: @result_teacher, render_edit: false, render_delete: false, display_deletion_warning_icon: false, is_show_page: false %>
+      <%= render 'teachers/teacher_info', teacher: @result_teacher, render_edit: false, render_edit_personal: false, render_delete: false, display_deletion_warning_icon: false, is_show_page: false %>
     <% end %>
   </div>
 </body>

diff --git a/app/views/teachers/_teacher_info.html.erb b/app/views/teachers/_teacher_info.html.erb
@@ -13,7 +13,9 @@
       <% end %>
       <% if render_edit %>
     	  <%= link_to "Edit Information", edit_teacher_path(teacher), class: "btn btn-primary mr-2" %>
-	      <%= link_to "Edit Personal Emails", edit_teacher_email_address_path(teacher), class: "btn btn-secondary mr-2" %>
+      <% end %>
+      <% if render_edit_personal %>
+        <%= link_to "Edit Personal Emails", edit_teacher_email_address_path(teacher), class: "btn btn-secondary mr-2" %>
       <% end %>
      <% if render_delete %>
         <%= link_to("Delete", teacher_path(teacher), method: "delete", class: "btn btn-danger", data: {confirm: "Are you sure?"}) %>

diff --git a/app/views/teachers/show.html.erb b/app/views/teachers/show.html.erb
@@ -1,6 +1,6 @@
 <%= provide(:h1, "#{@status} View #{@teacher.full_name}") %>
 
-<%= render 'teacher_info', teacher: @teacher, render_edit: true, render_delete: true, display_deletion_warning_icon: false, is_show_page: true %>
+<%= render 'teacher_info', teacher: @teacher, render_edit: true, render_edit_personal: true, render_delete: true, display_deletion_warning_icon: false, is_show_page: true %>
 
 <hr>
 <div class='row'>

diff --git a/db/schema.rb b/db/schema.rb
@@ -10,7 +10,6 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-
 ActiveRecord::Schema.define(version: 2024_04_15_190239) do
 
   # These are extensions that must be enabled in order to support this database
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,6 @@ @@
     #
     # It's strongly recommended that you check this file into your version control system.
     ActiveRecord::Schema.define(version: 2024_04_15_190239) do
       # These are extensions that must be enabled in order to support this database
@@ Expand Down @@