Rework password reset system to do away with the second email and instead

[rails.git] / app / controllers / trace_controller.rb

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 667f8577402cc822a2afe19b8947c9b49e57f87f..d0e3a853c913cb42f0ff5c1ce81f909570b6ad5d 100644 (file)
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -9,8 +9,6 @@ class TraceController < ApplicationController
   before_filter :check_database_writable, :only => [:create, :edit, :delete, :make_public]
   before_filter :check_api_readable, :only => [:api_details, :api_data]
   before_filter :check_api_writable, :only => [:api_create]
   before_filter :check_database_writable, :only => [:create, :edit, :delete, :make_public]
   before_filter :check_api_readable, :only => [:api_details, :api_data]
   before_filter :check_api_writable, :only => [:api_create]

-  before_filter :require_allow_read_gpx, :only => [:api_details, :api_data]
-  before_filter :require_allow_write_gpx, :only => [:api_create]

  
   # Counts and selects pages of GPX traces for various criteria (by user, tags, public etc.).
   #  target_user - if set, specifies the user to fetch traces for.  if not set will fetch all traces
  
   # Counts and selects pages of GPX traces for various criteria (by user, tags, public etc.).
   #  target_user - if set, specifies the user to fetch traces for.  if not set will fetch all traces


@@ -111,7 +109,7 @@ class TraceController < ApplicationController
 
     if @trace and @trace.visible? and
        (@trace.public? or @trace.user == @user)
 
     if @trace and @trace.visible? and
        (@trace.public? or @trace.user == @user)

-      @title = t 'trace.view.viewing_trace', :name => @trace.name
+      @title = t 'trace.view.title', :name => @trace.name

     else
       flash[:notice] = t 'trace.view.trace_not_found'
       redirect_to :controller => 'trace', :action => 'list'
     else
       flash[:notice] = t 'trace.view.trace_not_found'
       redirect_to :controller => 'trace', :action => 'list'


@@ -168,6 +166,7 @@ class TraceController < ApplicationController
     @trace = Trace.find(params[:id])
 
     if @user and @trace.user == @user
     @trace = Trace.find(params[:id])
 
     if @user and @trace.user == @user

+      @title = t 'trace.edit.title', :name => @trace.name

       if params[:trace]
         @trace.description = params[:trace][:description]
         @trace.tagstring = params[:trace][:tagstring]
       if params[:trace]
         @trace.description = params[:trace][:description]
         @trace.tagstring = params[:trace][:tagstring]