Merge pull request #21 from leapcode/feature/misc_cleanup

Feature/misc cleanup

5 files changed, 15 insertions, 15 deletions

diff --git a/help/app/controllers/tickets_controller.rb b/help/app/controllers/tickets_controller.rb
index b613088..d5a3da7 100644
--- a/help/app/controllers/tickets_controller.rb
+++ b/help/app/controllers/tickets_controller.rb
@@ -15,17 +15,15 @@ class TicketsController < ApplicationController
 
   def create
     @ticket = Ticket.new(params[:ticket])
-    if logged_in?
-      @ticket.created_by = current_user.id
-      @ticket.email = current_user.email if current_user.email
-      @ticket.comments.last.posted_by = current_user.id
-    else
-      @ticket.comments.last.posted_by = nil #hacky, but protecting this attribute doesn't work right, so this should make sure it isn't set.
-    end
+
+    @ticket.comments.last.posted_by = (logged_in? ? current_user.id : nil) #protecting posted_by isn't working, so this should protect it.
+    @ticket.created_by = current_user.id if logged_in?
+    @ticket.email = current_user.email if logged_in? and current_user.email
+
     flash[:notice] = 'Ticket was successfully created.' if @ticket.save
-    if !logged_in?
-      flash[:notice] = flash[:notice] + ' You can later access this ticket at the url ' + request.protocol + request.host_with_port + ticket_path(@ticket.id) + '. You might want to bookmark this page to find it again. Anybody with this URL will be able to access this ticket, so if you are on a shared computer you might want to remove it from the browser history' #todo
-    end
+
+    # cannot set this until ticket has been saved, as @ticket.id will not be set
+    flash[:notice] += " " + t(:access_ticket_text, :full_url => ticket_url(@ticket.id)) if !logged_in? and flash[:notice]
     respond_with(@ticket)
 
   end
diff --git a/help/app/views/tickets/_ticket_data.html.haml b/help/app/views/tickets/_ticket_data.html.haml
index d68d3e9..6a1a896 100644
--- a/help/app/views/tickets/_ticket_data.html.haml
+++ b/help/app/views/tickets/_ticket_data.html.haml
@@ -2,7 +2,7 @@
   %b
     Created by:
   - if @ticket.created_by_user
-    = link_to @ticket.created_by_user.login, edit_user_path(@ticket.created_by_user) #todo: won't want edit path
+    = link_to @ticket.created_by_user.login, user_path(@ticket.created_by_user)
   - else
     Unauthenticated ticket creator
   - if @ticket.regarding_user
@@ -10,7 +10,7 @@
       Regarding user:
     - if admin?
       - if @ticket.regarding_user_actual_user
-        = link_to @ticket.regarding_user_actual_user.login, edit_user_path(@ticket.regarding_user_actual_user) #todo: won't want edit path
+        = link_to @ticket.regarding_user_actual_user.login, user_path(@ticket.regarding_user_actual_user)
       - else
         = @ticket.regarding_user + ' (no such user)'
     - else # a non-admin is viewing the ticket, so they shouldn't see confirmation of whether the regarding_user exists or not.
diff --git a/help/config/locales/en.yml b/help/config/locales/en.yml
new file mode 100644
index 0000000..4ea662a
--- /dev/null
+++ b/help/config/locales/en.yml
@@ -0,0 +1,2 @@
+en:
+  access_ticket_text: "You can later access this ticket at the url %{full_url}. You might want to bookmark this page to find it again. Anybody with this URL will be able to access this ticket, so if you are on a shared computer you might want to remove it from the browser history"
diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml
index 03088d8..238c0eb 100644
--- a/users/app/views/users/edit.html.haml
+++ b/users/app/views/users/edit.html.haml
@@ -6,8 +6,8 @@
     = render 'cancel_account' if @user == current_user
   - content_for :email do
     %legend=t :email_address
-    Your email address is
-    = render user.email_address, :as => :span
+    The associated email address is
+    = render @user.email_address, :as => :span
     = user_form_with 'email_forward_field', :legend => :forward_email
     = user_form_with 'email_aliases', :legend => :add_email_alias
   = render 'tabs/tabs', :tabs => [:account, :email]
diff --git a/users/app/views/users/show.html.haml b/users/app/views/users/show.html.haml
index a1eeccb..056ed57 100644
--- a/users/app/views/users/show.html.haml
+++ b/users/app/views/users/show.html.haml
@@ -3,7 +3,7 @@
   .small
     = link_to 'edit', edit_user_path(@user)
   %dl.offset1
-    - fields = ['login', 'email', 'created_at', 'updated_at', 'email_forward']
+    - fields = ['login', 'email_address', 'created_at', 'updated_at', 'email_forward']
     - fields.each do |field|
       %dt
         = field.titleize