fixed routing issue when using locales. fixed issue requiring cdm_dir…

…s to be set.

app/controllers/cdm_migrator/cdm_controller.rb

@@ -5,7 +5,7 @@ def initialize
 			super
 			@cdm_url = CdmMigrator::Engine.config["cdm_url"]
 			@cdm_port = CdmMigrator::Engine.config["cdm_port"]
-			@cdm_dirs = CdmMigrator::Engine.config["cdm_dirs"]
+			@cdm_dirs = CdmMigrator::Engine.config["cdm_dirs"] || false
 		end
 
 		before_action :set_exclusive_fields, only: [:generate, :mappings]
@@ -83,7 +83,9 @@ def generate
 		def mappings
 			json = JSON.parse(Net::HTTP.get_response(URI.parse("#{@cdm_url}:#{@cdm_port}/dmwebservices/index.php?q=dmGetCollectionFieldInfo/"+params['collection']+'/json')).body)
 			@cdm_terms = json.collect { |c| [c['name'],c['nick']] }
-			get_dirs
+			if @cdm_dirs
+				get_dirs
+			end
 		end
 
 		def collection

app/controllers/cdm_migrator/csv_controller.rb

@@ -24,7 +24,7 @@ def create
 			CsvUploadJob.perform_later(params[:csv_import][:csv_file].path, params[:csv_import][:mvs], @current_user)
 			#perform(params[:csv_import][:csv_file].path, params[:csv_import][:mvs], @current_user)
 			flash[:notice] = "csv successfully uploaded"
-			redirect_to "/csv/upload"
+			redirect_to csv_upload_path
 		end
 
 		def perform(csv, mvs, current_user)

app/views/cdm_migrator/cdm/mappings.html.erb

@@ -9,7 +9,7 @@ table td{
 border:1px solid black;
 }
 </style>
-<%= form_tag cdm_generate_path+".csv" do %>
+<%= form_tag cdm_generate_path.gsub("generate",".csv") do %>
 <%= hidden_field_tag "collection", params[:collection] %>
 <%= hidden_field_tag "file_system", params[:file_system] %>
   <table>
@@ -27,7 +27,7 @@ border:1px solid black;
     </tr>
   <% end %>
   </table>
-  <%= select_tag "mappings_url", options_for_select(@dirs) %>
+  <%= select_tag "mappings_url", options_for_select(@dirs) if @cdm_dirs %>
   <%= hidden_field_tag "work", params[:work] %>
   <%= submit_tag 'generate csv' %>
 <% end %>

app/views/cdm_migrator/csv/upload.html.erb

@@ -1,4 +1,4 @@
-<%= form_for :csv_import, url: "/csv/upload" do |f| %>
+<%= form_for :csv_import, url: csv_create_path do |f| %>
 	<%= f.label 'Multi-value Separator:' %>
     <%= f.text_field 'mvs' %>
     <br />
@@ -7,4 +7,4 @@
 	<%= f.submit 'Save' %>
 <% end %>
 <br />
-<%= link_to "template", "/csv/generate.csv" %>
+<%= link_to "template", csv_generate_path %>

config/routes.rb

@@ -1,7 +1,7 @@
 CdmMigrator::Engine.routes.draw do
-  get '/csv/upload', to: 'csv#upload'
-  post '/csv/upload', to: 'csv#create'
-  get '/csv/generate', to: 'csv#generate'
+  get '/csv/upload', to: 'csv#upload', as: 'csv_upload'
+  post '/csv/upload', to: 'csv#create', as: 'csv_create'
+  get '/csv/generate', to: 'csv#generate', as: 'csv_generate'
 
   get 'cdm/collection', to: 'cdm#collection'
   get 'cdm/mappings/', to: 'cdm#mappings', as: 'cdm_mappings'

lib/generators/cdm_migrator/install/templates/config/cdm_migrator.yml

@@ -1,2 +1,5 @@
 cdm_url: 'http://your-content-dm-host'
-cdm_port: 8080
+cdm_port: 8080
+cdm_dirs:
+  dir1: '/dir1/path/goes/here'
+  dir2: '/dir2/path/goes/here'