Merge pull request #265 from tosdr/add-more-than-one-point

added another submit button on the form page so that the redirect goe…

Author: Christopher Talib

app/controllers/points_controller.rb

@@ -1,41 +1,36 @@
 class PointsController < ApplicationController
   before_action :set_point, only: [:show, :edit,:featured, :update, :destroy]
 
-  # before_action :set_service
-  # before_action :set_topic
-
   def index
    @points = Point.all
     if @query = params[:query]
       @points = Point.search_points_by_multiple(@query)
-
     end
   end
 
   def new
     @point = Point.new
     @services = Service.all
     @topics = Topic.all
-    # if current_user
-    #   @point = Point.new
-    # else
-    #   flash[:notice] = "Please log in before adding a point"
-    #   redirect_to new_user_path
-    # end
   end
 
   def create
     @point = Point.new(point_params)
     @point.user = current_user
-    # need to instantiate the services ?
-    # @point.topic = @topic
-    # @point.service = @service
-    # if yes, TODO: create the setting private methods
-    if @point.save
-      redirect_to points_path
-      flash[:notice] = "You created a point!"
-    else
-      render :new
+    if params[:only_create]
+      if @point.save
+        redirect_to points_path
+        flash[:notice] = "You created a point!"
+      else
+        render :new
+      end
+    elsif params[:create_add_another]
+      if @point.save
+        redirect_to new_point_path
+        flash[:notice] = "You created a point! Feel free to add another."
+      else
+        render :new
+      end
     end
   end
 
@@ -44,7 +39,6 @@ def edit
 
   def show
     puts @point.id
-    # @comments = @point.comments
     @comments = Comment.where(point_id: @point.id)
   end
 
@@ -74,30 +68,15 @@ def featured
     end
   end
 
-  # def upvote
-  #   @vote = Vote.new(point_id: @point.id, user_id: current_user.id)
-  #   if @vote.save
-  #     respond_to do |format|
-  #       format.html { redirect_to point_path(@point)}
-  #       format.js
-  #     end
-  #   end
-  # end
-
   def user_points
     @points = current_user.points
     if @query = params[:query]
       @points = Point.search_points_by_multiple(@query)
     end
   end
 
-
   private
 
-  # def set_point_by_point_id
-  #   @point = Point.find(params[:point_id])
-  # end
-
   def set_point
     @point = Point.find(params[:id])
   end
@@ -106,10 +85,6 @@ def set_service
     @service = Service.find(params[:service_id])
   end
 
-  # def set_topic
-  #   @topic = Topic.find(params[:topic_id])
-  # end
-
   def point_params
     params.require(:point).permit(:title, :source, :status, :rating, :analysis, :topic_id, :service_id, :is_featured, :query)
   end

app/views/points/_form.html.erb

@@ -1,7 +1,7 @@
 <div class="form-login">
   <div class="row row-form">
     <div class="point-form-text">
-      <p>When submiting a contribution. You submit what we call a point. It's an analysis on one specific point of the ToS of the service you want to rate. All points have a rating from 1 to 10 and the class given to the service is the average of the all those points. See the <a href="/about#classification">about page</a> for more information.</p>
+      <p>When submitting a contribution, you submit what we call a "point." It's an analysis on one specific aspect of the ToS of the service that you want to rate. All points have a rating from 1 to 10 and the class given to the service is the average of all those ratings. See the <a href="/about#classification">about page</a> for more information.</p>
 
       <p>Each point submitted by a user has to be reviewed by a curator before being displayed on the website. You will recieve a message by email from the curator who reviewed your point.</p>
     </div>
@@ -36,7 +36,8 @@
       <%= link_to "Back", :back, class: "btn btn-default" %>
     </div>
     <div class="form-actions col-xs-8 col-sm-4 col-sm-offset-6 col-md-3 col-md-offset-7">
-      <%= f.submit class: 'btn btn-primary' %>
+      <%= f.submit "Submit Point", name: "only_create", class: 'btn btn-primary' %>
+      <%= f.submit "Submit Point + Add Another", name: "create_add_another", class: 'btn btn-primary' %>
     </div>
   </div>
   <% end %>

db/migrate/20171214143221_create_comments.rb

@@ -1,5 +1,6 @@
 class CreateComments < ActiveRecord::Migration[5.1]
   def change
+    drop_table :comments
     create_table :comments do |t|
       t.references :point, foreign_key: true
       t.string :summary

db/schema.rb

@@ -87,10 +87,13 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "grade"
+    t.bigint "user_id"
+    t.string "status"
     t.string "wikipedia"
     t.string "keywords"
     t.string "related"
     t.string "slug"
+    t.index ["user_id"], name: "index_services_on_user_id"
   end
 
   create_table "topics", force: :cascade do |t|
@@ -143,4 +146,5 @@
   add_foreign_key "points", "users"
   add_foreign_key "reasons", "points"
   add_foreign_key "reasons", "users"
+  add_foreign_key "services", "users"
 end