From 04376c286daee0165f6544ecdafaa645aa7695c0 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Sat, 22 Dec 2012 15:51:24 +0100
Subject: moving the js for view definitions into separate files

This way we get syntax highlighting and so on.
---
 users/app/models/user.rb | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

(limited to 'users/app/models/user.rb')

diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 2a8a57b..1798ea4 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -46,37 +46,10 @@ class User < CouchRest::Model::Base
   timestamps!
 
   design do
+    load_views(Rails.root.join('users', 'app', 'designs', 'user'))
     view :by_login
     view :by_created_at
     view :by_email
-
-    view :by_email_alias,
-      :map => <<-EOJS
-    function(doc) {
-      if (doc.type != 'User') {
-        return;
-      }
-      doc.email_aliases.forEach(function(alias){
-        emit(alias.email, doc);
-      });
-    }
-    EOJS
-
-    view :by_email_or_alias,
-      :map => <<-EOJS
-    function(doc) {
-      if (doc.type != 'User') {
-        return;
-      }
-      if (doc.email) {
-        emit(doc.email, doc);
-      }
-      doc.email_aliases.forEach(function(alias){
-        emit(alias.email, doc);
-      });
-    }
-    EOJS
-
   end
 
   class << self
-- 
cgit v1.2.3


From 2599c7bac06ee55d58e492a47e09ee163e9582ba Mon Sep 17 00:00:00 2001
From: jessib <jessib@leap.se>
Date: Tue, 8 Jan 2013 13:20:34 -0800
Subject: Adding show view for users.

---
 users/app/models/user.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'users/app/models/user.rb')

diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 1798ea4..4b6b06c 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -100,6 +100,10 @@ class User < CouchRest::Model::Base
     email_aliases.build(attrs.values.first) if attrs
   end
 
+  def most_recent_tickets(count=3)
+    Ticket.for_user(self).limit(count) #defaults to having most recent updated first
+  end
+
   protected
 
   ##
-- 
cgit v1.2.3


From 1623f51cc003f7de92f7192bba5ca88dfb2a92f6 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Fri, 11 Jan 2013 10:23:51 +0100
Subject: basic dummy data for users

---
 users/app/models/user.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'users/app/models/user.rb')

diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 1798ea4..8474d16 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -18,8 +18,8 @@ class User < CouchRest::Model::Base
     :if => :serverside?
 
   validates :login,
-    :format => { :with => /\A[A-Za-z\d_]+\z/,
-      :message => "Only letters, digits and _ allowed" }
+    :format => { :with => /\A[A-Za-z\d_\.]+\z/,
+      :message => "Only letters, digits, . and _ allowed" }
 
   validates :password_salt, :password_verifier,
     :format => { :with => /\A[\dA-Fa-f]+\z/, :message => "Only hex numbers allowed" }
@@ -57,7 +57,7 @@ class User < CouchRest::Model::Base
 
     # valid set of attributes for testing
     def valid_attributes_hash
-      { :login => "me",
+      { :login => Faker::Name.first_name.downcase,
         :password_verifier => "1234ABCD",
         :password_salt => "4321AB" }
     end
-- 
cgit v1.2.3


From 3cd3c261bdf02b2da5217fa1c469d30f9d92c9a3 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Mon, 14 Jan 2013 12:04:12 +0100
Subject: got users controller test to pass - tickets controller test next.

---
 users/app/models/user.rb | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'users/app/models/user.rb')

diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 8474d16..f20c6ac 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -54,17 +54,11 @@ class User < CouchRest::Model::Base
 
   class << self
     alias_method :find_by_param, :find
-
-    # valid set of attributes for testing
-    def valid_attributes_hash
-      { :login => Faker::Name.first_name.downcase,
-        :password_verifier => "1234ABCD",
-        :password_salt => "4321AB" }
-    end
-
   end
 
-  alias_method :to_param, :id
+  def to_param
+    self.id
+  end
 
   def to_json(options={})
     {
-- 
cgit v1.2.3


From 8141876126aa25d713cf4b2c76c3ecff837c4ba7 Mon Sep 17 00:00:00 2001
From: jessib <jessib@leap.se>
Date: Mon, 14 Jan 2013 12:39:59 -0800
Subject: Use partials for displaying details shown when viewing a user. Some
 of these partials have specific CSS for another use, so we will likely want
 to tweak this.

---
 users/app/models/user.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'users/app/models/user.rb')

diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 42900ea..1e8ee0e 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -95,7 +95,7 @@ class User < CouchRest::Model::Base
   end
 
   def most_recent_tickets(count=3)
-    Ticket.for_user(self).limit(count) #defaults to having most recent updated first
+    Ticket.for_user(self).limit(count).all #defaults to having most recent updated first
   end
 
   protected
-- 
cgit v1.2.3