Using javascript and data attribute instead of inline css

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

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 105405ccfdad7e0fd11b525443a4786ed496f307..a720c5fff438dc1ed4e8d9152e85dacf44ed4cc1 100644 (file)
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -119,9 +119,7 @@ class TraceController < ApplicationController
         if @trace.id
           flash[:notice] = t "trace.create.trace_uploaded"
 
         if @trace.id
           flash[:notice] = t "trace.create.trace_uploaded"
 

-          if current_user.traces.where(:inserted => false).count > 4
-            flash[:warning] = t "trace.trace_header.traces_waiting", :count => current_user.traces.where(:inserted => false).count
-          end
+          flash[:warning] = t "trace.trace_header.traces_waiting", :count => current_user.traces.where(:inserted => false).count if current_user.traces.where(:inserted => false).count > 4

 
           redirect_to :action => :list, :display_name => current_user.display_name
         end
 
           redirect_to :action => :list, :display_name => current_user.display_name
         end


@@ -176,9 +174,7 @@ class TraceController < ApplicationController
         @trace.description = params[:trace][:description]
         @trace.tagstring = params[:trace][:tagstring]
         @trace.visibility = params[:trace][:visibility]
         @trace.description = params[:trace][:description]
         @trace.tagstring = params[:trace][:tagstring]
         @trace.visibility = params[:trace][:visibility]

-        if @trace.save
-          redirect_to :action => "view", :display_name => current_user.display_name
-        end
+        redirect_to :action => "view", :display_name => current_user.display_name if @trace.save

       end
     end
   rescue ActiveRecord::RecordNotFound
       end
     end
   rescue ActiveRecord::RecordNotFound


@@ -205,9 +201,7 @@ class TraceController < ApplicationController
   def georss
     @traces = Trace.visible_to_all.visible
 
   def georss
     @traces = Trace.visible_to_all.visible
 

-    if params[:display_name]
-      @traces = @traces.joins(:user).where(:users => { :display_name => params[:display_name] })
-    end
+    @traces = @traces.joins(:user).where(:users => { :display_name => params[:display_name] }) if params[:display_name]

 
     @traces = @traces.tagged(params[:tag]) if params[:tag]
     @traces = @traces.order("timestamp DESC")
 
     @traces = @traces.tagged(params[:tag]) if params[:tag]
     @traces = @traces.order("timestamp DESC")