Merge branch 'master' into feature/unauthenticated_tickets

Conflicts:
	help/app/views/tickets/_comment.html.haml
	help/app/views/tickets/_new_comment.html.haml

12 files changed, 84 insertions, 94 deletions

diff --git a/help/app/designs/ticket/by_includes_post_by.js b/help/app/designs/ticket/by_includes_post_by.js
new file mode 100644
index 0000000..2eeac89
--- /dev/null
+++ b/help/app/designs/ticket/by_includes_post_by.js
@@ -0,0 +1,13 @@
+// TODO: This view is only used in tests--should we keep it?
+function(doc) {
+  var arr = {}
+  if (doc['type'] == 'Ticket' && doc.comments) {
+    doc.comments.forEach(function(comment){
+      if (comment.posted_by && !arr[comment.posted_by]) {
+        //don't add duplicates
+        arr[comment.posted_by] = true;
+        emit(comment.posted_by, 1);
+      }
+    });
+  }
+}
diff --git a/help/app/designs/ticket/by_includes_post_by_and_created_at.js b/help/app/designs/ticket/by_includes_post_by_and_created_at.js
new file mode 100644
index 0000000..72169b0
--- /dev/null
+++ b/help/app/designs/ticket/by_includes_post_by_and_created_at.js
@@ -0,0 +1,12 @@
+function(doc) {
+  var arr = {}
+  if (doc['type'] == 'Ticket' && doc.comments) {
+    doc.comments.forEach(function(comment){
+      if (comment.posted_by && !arr[comment.posted_by]) {
+        //don't add duplicates
+        arr[comment.posted_by] = true;
+        emit([comment.posted_by, doc.created_at], 1);
+      }
+    });
+  }
+}
diff --git a/help/app/designs/ticket/by_includes_post_by_and_is_open_and_created_at.js b/help/app/designs/ticket/by_includes_post_by_and_is_open_and_created_at.js
new file mode 100644
index 0000000..33dfe0b
--- /dev/null
+++ b/help/app/designs/ticket/by_includes_post_by_and_is_open_and_created_at.js
@@ -0,0 +1,12 @@
+function(doc) {
+  var arr = {}
+  if (doc['type'] == 'Ticket' && doc.comments) {
+    doc.comments.forEach(function(comment){
+      if (comment.posted_by && !arr[comment.posted_by]) {
+        //don't add duplicates
+        arr[comment.posted_by] = true;
+        emit([comment.posted_by, doc.is_open, doc.created_at], 1);
+      }
+    });
+  }
+}
diff --git a/help/app/designs/ticket/by_includes_post_by_and_is_open_and_updated_at.js b/help/app/designs/ticket/by_includes_post_by_and_is_open_and_updated_at.js
new file mode 100644
index 0000000..3bd2a74
--- /dev/null
+++ b/help/app/designs/ticket/by_includes_post_by_and_is_open_and_updated_at.js
@@ -0,0 +1,12 @@
+function(doc) {
+  var arr = {}
+  if (doc['type'] == 'Ticket' && doc.comments) {
+    doc.comments.forEach(function(comment){
+      if (comment.posted_by && !arr[comment.posted_by]) {
+        //don't add duplicates
+        arr[comment.posted_by] = true;
+        emit([comment.posted_by, doc.is_open, doc.updated_at], 1);
+      }
+    });
+  }
+}
diff --git a/help/app/designs/ticket/by_includes_post_by_and_updated_at.js b/help/app/designs/ticket/by_includes_post_by_and_updated_at.js
new file mode 100644
index 0000000..2b4304f
--- /dev/null
+++ b/help/app/designs/ticket/by_includes_post_by_and_updated_at.js
@@ -0,0 +1,12 @@
+function(doc) {
+  var arr = {}
+  if (doc['type'] == 'Ticket' && doc.comments) {
+    doc.comments.forEach(function(comment){
+      if (comment.posted_by && !arr[comment.posted_by]) {
+        //don't add duplicates
+        arr[comment.posted_by] = true;
+        emit([comment.posted_by, doc.updated_at], 1);
+      }
+    });
+  }
+}
diff --git a/help/app/models/ticket.rb b/help/app/models/ticket.rb
index 262d5a4..ed1ff9d 100644
--- a/help/app/models/ticket.rb
+++ b/help/app/models/ticket.rb
@@ -47,84 +47,7 @@ class Ticket < CouchRest::Model::Base
     view :by_is_open_and_created_at
     view :by_is_open_and_updated_at
 
-
-    #TODO: This view is only used in tests--should we keep it?
-    view :by_includes_post_by,
-      :map =>
-      "function(doc) {
-        var arr = {}
-        if (doc['type'] == 'Ticket' && doc.comments) {
-          doc.comments.forEach(function(comment){
-          if (comment.posted_by && !arr[comment.posted_by]) {
-             //don't add duplicates
-             arr[comment.posted_by] = true;
-             emit(comment.posted_by, 1);
-          }
-          });
-        }
-      }", :reduce => "function(k,v,r) { return sum(v); }"
-
-    view :by_includes_post_by_and_is_open_and_updated_at,
-      :map =>
-      "function(doc) {
-        var arr = {}
-        if (doc['type'] == 'Ticket' && doc.comments) {
-          doc.comments.forEach(function(comment){
-          if (comment.posted_by && !arr[comment.posted_by]) {
-            //don't add duplicates
-            arr[comment.posted_by] = true;
-            emit([comment.posted_by, doc.is_open, doc.updated_at], 1);
-          }
-          });
-        }
-      }", :reduce => "function(k,v,r) { return sum(v); }"
-
-    view :by_includes_post_by_and_is_open_and_created_at,
-      :map =>
-      "function(doc) {
-        var arr = {}
-        if (doc['type'] == 'Ticket' && doc.comments) {
-          doc.comments.forEach(function(comment){
-          if (comment.posted_by && !arr[comment.posted_by]) {
-            //don't add duplicates
-            arr[comment.posted_by] = true;
-            emit([comment.posted_by, doc.is_open, doc.created_at], 1);
-          }
-          });
-        }
-      }", :reduce => "function(k,v,r) { return sum(v); }"
-
-    view :by_includes_post_by_and_updated_at,
-      :map =>
-      "function(doc) {
-        var arr = {}
-        if (doc['type'] == 'Ticket' && doc.comments) {
-          doc.comments.forEach(function(comment){
-          if (comment.posted_by && !arr[comment.posted_by]) {
-            //don't add duplicates
-            arr[comment.posted_by] = true;
-            emit([comment.posted_by, doc.updated_at], 1);
-          }
-          });
-        }
-      }", :reduce => "function(k,v,r) { return sum(v); }"
-
-
-    view :by_includes_post_by_and_created_at,
-      :map =>
-      "function(doc) {
-        var arr = {}
-        if (doc['type'] == 'Ticket' && doc.comments) {
-          doc.comments.forEach(function(comment){
-          if (comment.posted_by && !arr[comment.posted_by]) {
-            //don't add duplicates
-            arr[comment.posted_by] = true;
-            emit([comment.posted_by, doc.created_at], 1);
-          }
-          });
-        }
-      }", :reduce => "function(k,v,r) { return sum(v); }"
-
+    load_views(Rails.root.join('help', 'app', 'designs', 'ticket'))
   end
 
   validates :title, :presence => true
@@ -132,7 +55,7 @@ class Ticket < CouchRest::Model::Base
 
 
   # html5 has built-in validation which isn't ideal, as it says 'please enter an email address' for invalid email addresses, which implies an email address is required, and it is not.
-  validates :email, :format => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/, :if => :email #email address is optional
+  validates :email, :allow_blank => true, :format => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/
 
   #TODO:
   #def set_created_by
diff --git a/help/app/views/tickets/_comment.html.haml b/help/app/views/tickets/_comment.html.haml
index 01cf01a..501ceec 100644
--- a/help/app/views/tickets/_comment.html.haml
+++ b/help/app/views/tickets/_comment.html.haml
@@ -7,7 +7,8 @@
           = 'Posted by' + (comment.posted_by_user.is_admin? ? ' admin' : '') + ':'
         = comment.posted_by_user.login
       - else
-        Unauthenticated post
+        %b
+          Unauthenticated post
       - if comment.private
         (Private comment)
       .pull-right
@@ -15,4 +16,5 @@
           Posted at:
         = comment.posted_at.to_s(:short)
       %br
-      = comment.body
\ No newline at end of file
+      = comment.body
+
diff --git a/help/app/views/tickets/_new_comment.html.haml b/help/app/views/tickets/_new_comment.html.haml
index 8d40bb6..96388ea 100644
--- a/help/app/views/tickets/_new_comment.html.haml
+++ b/help/app/views/tickets/_new_comment.html.haml
@@ -1,4 +1,4 @@
 = f.simple_fields_for :comments, @comment do |c|
-  = c.input :body, :label => 'Comment', :as => :text, :input_html => {:class => "span12", :rows=>4}
+  = 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 2261d8f..d68d3e9 100644
--- a/help/app/views/tickets/_ticket_data.html.haml
+++ b/help/app/views/tickets/_ticket_data.html.haml
@@ -32,4 +32,4 @@
     = button_to 'Close', {:post => {:is_open => false}}, :method => :put, :class => 'btn btn-small'
   - else
     = 'closed'
-    = button_to 'Open', {:post => {:is_open => true}}, :method => :put, :class => 'btn btn-small'
\ No newline at end of file
+    = button_to 'Open', {:post => {:is_open => true}}, :method => :put, :class => 'btn btn-small'
diff --git a/help/app/views/tickets/new.html.haml b/help/app/views/tickets/new.html.haml
index af8baad..1aa689b 100644
--- a/help/app/views/tickets/new.html.haml
+++ b/help/app/views/tickets/new.html.haml
@@ -1,6 +1,6 @@
 .span12
   %h2=t :new_ticket
-  = simple_form_for(@ticket, :html => {:novalidate => true})  do |f| #turn off html5 validations to test
+  = 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
diff --git a/help/app/views/tickets/show.html.haml b/help/app/views/tickets/show.html.haml
index 3f00b35..a69048b 100644
--- a/help/app/views/tickets/show.html.haml
+++ b/help/app/views/tickets/show.html.haml
@@ -8,7 +8,7 @@
     = render(:partial => "comment", :collection => @ticket.comments)
   = #render @ticket.comments should work if view is in /app/views/comments/_comment
 
-  = simple_form_for(@ticket, :html => {:novalidate => true}) do |f| #turn off html5 validations to test
+  = simple_form_for @ticket, :html => {:class => 'form-horizontal'}  do |f| # don't need validations so long as this is so simple
     = render :partial => 'new_comment', :locals => {:f => f}
     .span10.offset3
       = f.button :submit, @post_reply_str, :class => 'btn-primary'