From 96d2fa1cb6739842bb13eee63573c0d9ad48db19 Mon Sep 17 00:00:00 2001 From: Miles Gould Date: Sat, 18 Oct 2014 17:41:52 +0100 Subject: [PATCH] Put alternate names controller in standard order. --- app/controllers/alternate_names_controller.rb | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/app/controllers/alternate_names_controller.rb b/app/controllers/alternate_names_controller.rb index c7a0ac910..34aa738d3 100644 --- a/app/controllers/alternate_names_controller.rb +++ b/app/controllers/alternate_names_controller.rb @@ -1,9 +1,15 @@ class AlternateNamesController < ApplicationController load_and_authorize_resource - # GET /alternate_names/1/edit - def edit - @alternate_name = AlternateName.find(params[:id]) + # GET /scientific_names + # GET /scientific_names.json + def index + @scientific_names = ScientificName.all + + respond_to do |format| + format.html # index.html.haml + format.json { render json: @scientific_names } + end end # GET /alternate_names/1 @@ -29,6 +35,11 @@ class AlternateNamesController < ApplicationController end end + # GET /alternate_names/1/edit + def edit + @alternate_name = AlternateName.find(params[:id]) + end + # POST /alternate_names # POST /alternate_names.json def create