Remove nowrap on footer text, to accommodate narrow screens

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

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 51ef4491d35363be75437919e9089537f1eeff9a..fde27e8b29e05dd1a512a5e15989bb1c0dcb0127 100644 (file)
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -127,7 +127,7 @@ class NotesController < ApplicationController
     comment = params[:text]
 
     # Find the note and check it is valid
     comment = params[:text]
 
     # Find the note and check it is valid

-    @note = Note.find_by_id(id)
+    @note = Note.find_by(:id => id)

     raise OSM::APINotFoundError unless @note
     raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?
     raise OSM::APINoteAlreadyClosedError.new(@note) if @note.closed?
     raise OSM::APINotFoundError unless @note
     raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?
     raise OSM::APINoteAlreadyClosedError.new(@note) if @note.closed?


@@ -157,7 +157,7 @@ class NotesController < ApplicationController
     comment = params[:text]
 
     # Find the note and check it is valid
     comment = params[:text]
 
     # Find the note and check it is valid

-    @note = Note.find_by_id(id)
+    @note = Note.find_by(:id => id)

     raise OSM::APINotFoundError unless @note
     raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible? || @user.moderator?
     raise OSM::APINoteAlreadyOpenError.new(@note) unless @note.closed? || !@note.visible?
     raise OSM::APINotFoundError unless @note
     raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible? || @user.moderator?
     raise OSM::APINoteAlreadyOpenError.new(@note) unless @note.closed? || !@note.visible?


@@ -277,7 +277,7 @@ class NotesController < ApplicationController
   # Display a list of notes by a specified user
   def mine
     if params[:display_name]
   # Display a list of notes by a specified user
   def mine
     if params[:display_name]

-      if @this_user = User.active.find_by_display_name(params[:display_name])
+      if @this_user = User.active.find_by(:display_name => params[:display_name])

         @title = t "note.mine.title", :user => @this_user.display_name
         @heading = t "note.mine.heading", :user => @this_user.display_name
         @description = t "note.mine.subheading", :user => render_to_string(:partial => "user", :object => @this_user)
         @title = t "note.mine.title", :user => @this_user.display_name
         @heading = t "note.mine.heading", :user => @this_user.display_name
         @description = t "note.mine.subheading", :user => render_to_string(:partial => "user", :object => @this_user)


@@ -316,7 +316,7 @@ class NotesController < ApplicationController
   end
 
   ##
   end
 
   ##

-  # Generate a condition to choose which bugs we want based
+  # Generate a condition to choose which notes we want based

   # on their status and the user's request parameters
   def closed_condition(notes)
     closed_since = if params[:closed]
   # on their status and the user's request parameters
   def closed_condition(notes)
     closed_since = if params[:closed]