Merge branch 'master' into feature/tickets_controllers_simplification

Conflicts:
	users/app/controllers/users_controller.rb

5 files changed, 47 insertions, 28 deletions

diff --git a/help/app/views/tickets/_comment.html.haml b/help/app/views/tickets/_comment.html.haml
index 1d8ee41..501ceec 100644
--- a/help/app/views/tickets/_comment.html.haml
+++ b/help/app/views/tickets/_comment.html.haml
@@ -1,16 +1,20 @@
 - # style is super ugly but just for now
-%tr
-  %td
-    - if commenter = User.find(comment.posted_by)
-      %b
-        = 'Posted by' + (commenter.is_admin? ? ' admin' : '') + ':'
-      = commenter.login
-    - else
-      %b
-        Unauthenticated post
-    .pull-right
-      %b
-        Posted at:
-      = comment.posted_at.to_s(:short)
-    %br
-    = comment.body
+- if admin? or !comment.private # only show comment if user is admin or comment is not private
+  %tr
+    %td
+      - if comment.posted_by_user
+        %b
+          = 'Posted by' + (comment.posted_by_user.is_admin? ? ' admin' : '') + ':'
+        = comment.posted_by_user.login
+      - else
+        %b
+          Unauthenticated post
+      - if comment.private
+        (Private comment)
+      .pull-right
+        %b
+          Posted at:
+        = comment.posted_at.to_s(:short)
+      %br
+      = comment.body
+
diff --git a/help/app/views/tickets/_new_comment.html.haml b/help/app/views/tickets/_new_comment.html.haml
index 31d134f..96388ea 100644
--- a/help/app/views/tickets/_new_comment.html.haml
+++ b/help/app/views/tickets/_new_comment.html.haml
@@ -1,2 +1,4 @@
 = f.simple_fields_for :comments, @comment do |c|
   = c.input :body, :label => 'Comment', :as => :text, :input_html => {:class => "span9", :rows=>4}
+  - if admin?
+    = c.input :private, :as => :boolean, :label => false, :inline_label => true
diff --git a/help/app/views/tickets/_ticket.html.haml b/help/app/views/tickets/_ticket.html.haml
index 3edfa8b..7b37652 100644
--- a/help/app/views/tickets/_ticket.html.haml
+++ b/help/app/views/tickets/_ticket.html.haml
@@ -1,13 +1,17 @@
+- updated_at_text = 'updated: ' + ticket.updated_at.to_s(:long)
 %tr
   %td
     %b
       = link_to ticket.title, ticket
-    %br
-    %small
-      created:
-      = ticket.created_at.to_s(:short)
-      updated:
-      = ticket.updated_at.to_s(:short)
-    %small.pull-right
-      comments by:
-      = ticket.commenters 
+    - if params[:controller] == 'tickets'
+      %br
+      %small
+        created:
+        = ticket.created_at.to_s(:long)
+        = updated_at_text
+      %small.pull-right
+        comments by:
+        = ticket.commenters
+    - else
+      %small
+        = updated_at_text
\ No newline at end of file
diff --git a/help/app/views/tickets/_ticket_data.html.haml b/help/app/views/tickets/_ticket_data.html.haml
index fee080f..d68d3e9 100644
--- a/help/app/views/tickets/_ticket_data.html.haml
+++ b/help/app/views/tickets/_ticket_data.html.haml
@@ -1,10 +1,20 @@
 .spam12
   %b
     Created by:
-  - if User.find(@ticket.created_by)
-    = User.find(@ticket.created_by).login
+  - 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
   - else
     Unauthenticated ticket creator
+  - if @ticket.regarding_user
+    %b
+      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
+      - 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.
+      = @ticket.regarding_user
   - if @ticket.email
     %b
       email:
diff --git a/help/app/views/tickets/new.html.haml b/help/app/views/tickets/new.html.haml
index ee7adb2..1aa689b 100644
--- a/help/app/views/tickets/new.html.haml
+++ b/help/app/views/tickets/new.html.haml
@@ -3,9 +3,8 @@
   = simple_form_for @ticket, :validate => true, :html => {:class => 'form-horizontal'}  do |f|
     = f.input :title
     = f.input :email if !current_user  #hmm--might authenticated users want to submit an alternate email?
+    = f.input :regarding_user
     = render :partial => 'new_comment', :locals => {:f => f}
-    = # regarding_user if not logged in
-    = # email if not logged in
     .form-actions
       = f.button :submit, :class => 'btn-primary'
       = link_to t(:cancel), tickets_path, :class => :btn