Fixing conflicts #211

tutor/app/controllers/model_answers_controller.rb

@@ -46,6 +46,27 @@ def create
 		end
 	end
 
+	# [Remove Answer - Story 4.17]
+	# This action takes the model answer id, and check if it is not the last model answer in the
+	#	problem and remove it from the database and then redirects the user to the edit problem 
+	#	page of the problem that had the answer with a "Model Answer successfully Deleted" message.
+	# Parameters:
+	#	params[:id]: The current model answer's id
+	# Returns: 
+	#	flash[:notice]: A message indicating the success of the deletion
+	# Author: Ahmed Atef
+	def destroy
+		@model_answer = ModelAnswer.find_by_id(params[:id])
+		@current = Problem.find_by_id(@model_answer.problem_id)
+		if @current.model_answers.count == 1
+			flash[:notice] = "Cannot delete problem's last model answer"
+			redirect_to :back and return
+		elsif @model_answer.destroy
+			flash[:notice] = "Answer successfully Deleted"
+			redirect_to(:controller => 'problems', :action => 'edit', :id => @current.id)
+		end
+	end
+
 	# [Edit answer story 4.7]
 	# Answer that has been created before is edited
 	# Parameters:
@@ -83,7 +104,7 @@ def update
 
 		end
 	end
-	
+
 	# [Add answer story 4.6]
 	# It shows answer that was entered before.
 	# Parameters:

tutor/app/views/model_answers/_index.html.erb

@@ -48,6 +48,10 @@
 									{controller: :hints, action: :destroy, id: hint1.id},
 									:method => :delete, class: 'btn btn-primary btn-xs' %></td>
 						<td><a href="#" class="btn btn-danger btn-xs">Delete</a></td>
+						<td><%= button_to "Delete", {:controller => 'model_answers',:action => 'destroy',
+								:id => answer1.id}, method: :delete, class: 'btn btn-primary', 
+								:confirm => "Are you sure you want to delete 
+									this Answer ?" %></td>
 					</tr>
 				<% end %>
 			</tbody>