From 0a10dada4dd28605d356772299703c3974cebbdf Mon Sep 17 00:00:00 2001
From: Benjamin ter Kuile <bterkuile@gmail.com>
Date: Fri, 22 Jun 2012 13:32:05 +0200
Subject: [PATCH] fix cmtool pages index

---
 .gitignore                                      |   1 +
 app/controllers/cmtool/pages_controller.rb      |   2 +-
 lib/cmtool/includes/user.rb                     |   2 +-
 .../config/environments/.development.rb.swp     | Bin 12288 -> 0 bytes
 spec/spec_helper.rb                             |   8 ++++++++
 5 files changed, 11 insertions(+), 2 deletions(-)
 delete mode 100644 spec/dummy/config/environments/.development.rb.swp

diff --git a/.gitignore b/.gitignore
index 92eabb3..a310fe4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .bundle/
 log/*.log
 pkg/
+*.swp
 spec/dummy/db/*.sqlite3
 spec/dummy/log/*.log
 spec/dummy/tmp/
diff --git a/app/controllers/cmtool/pages_controller.rb b/app/controllers/cmtool/pages_controller.rb
index f583af9..1125bfe 100644
--- a/app/controllers/cmtool/pages_controller.rb
+++ b/app/controllers/cmtool/pages_controller.rb
@@ -3,7 +3,7 @@ module Cmtool
     # GET /pages
     # GET /pages.xml
     def index
-      @pages = ::Page.all.sort_by{|p| "#{p.parent.presence.try(:reverse) || p.name}#{p.position.to_s.rjust(6, "0")}" }
+      #@pages = ::Page.all.sort_by{|p| "#{p.parent.presence.try(:reverse) || p.name}#{p.position.to_s.rjust(6, "0")}" }
 
       respond_to do |format|
         format.html # index.html.erb
diff --git a/lib/cmtool/includes/user.rb b/lib/cmtool/includes/user.rb
index 8c5451a..28d8502 100644
--- a/lib/cmtool/includes/user.rb
+++ b/lib/cmtool/includes/user.rb
@@ -15,7 +15,7 @@ module Cmtool
 
         #== VALIDATIONS
         klass.validates_presence_of :email
-        klass.validates_uniqueness_of :email
+        klass.validates_uniqueness_of :email, if: lambda{ |u| u.email.present? }
         klass.validates_presence_of :encrypted_password, if: lambda{ |u| u.email.present? }
         klass.validates_confirmation_of :password, if: lambda{ |u| u.password.present? }
     
diff --git a/spec/dummy/config/environments/.development.rb.swp b/spec/dummy/config/environments/.development.rb.swp
deleted file mode 100644
index e5ee5b305cfaf1003342182d09188d844c835b88..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2&ub(_6vsQ>+;vs-<n5UeqOj?iHHb2p)xdgK*|0yN-n6Ode$!p1x~jLTI+IaU
z)}x{~59-PPLlBQ16!fA;{{+Fa;J0cf$!r#LUsFxKbh@kR)q9_MuOZ}3M(<qTrI+)q
z4A+xcw)WHf=9{nnvUcU?ESq??`@K{g#?H7V?{5leb0zc{lQ8u0vB6<!+D_=XH%7T(
z#RsfR*Ru9QD<s~OZ5SE4j>}=yx9uDY^i<YE)(6rW9j4y5F1M4j_fDgUz_}*S`|0K@
zm$I!FuZ#kR!TPiG^iyx2Ya}W7L?97J1QLNnAQ4Ce5`jeEyb<u-TJ{Noeq<T=#`3;)
z>b`tTw?rTjNCXmrL?97J1QLNnAQ4Ce5`jb@5qJm*h$_pzdNj*+FTi>H|NrRk|39C|
zvd^K<px2?l9?!DxpiiND&}-0h&;a`TQkMM)eF=R5F*JgP&_9o5*>BLV(AUs=(7Vt@
z=mPY^Mc9PyK|9bh&>!&Scj$ZQTj(1|L${&m=R?Rjxts_j0*OE(kO(9KiNODo0P89v
zTC{5B!a4RXuXxhev`yajjKKlDafr^(%8_rFl+^5K*2uCUWkeNUE*54FSPDI(mYsvK
zsZefV?V2HNJoa3Uoh%+4J5qXiz=h?~*eVyjHw7PdN=RM!1_m3WssaxV6M|#gG|FF!
zuFj-yXz%t7>G?A4&hgu2g70+8IA2@F^9ym_4O2(Y@Ahox1k;+P#!`5ch|i0CscUMD
zWlY1MZ=|E=XU6Wk5axe)+9H+$l6CBNEu7HO%MaMX!?E*LmOd`NBcx;E!;(8MjVAnr
zrF62CI%_-w1BQZQJCO+8iA3O6#VR^-baHWK(V`WXEe>!hdgY7Ws=~w_0-_IT+<*dY
zU#0cN`))iODpLv-UXHg$qtQBjw0eXKla+Lx@MV)v*!jYFz!bJ}h3mV{SXiU+1P#Yt
z>KNHgt>)AtxG;V5c>3ni^f;HK_J$_b%pBX(Vc^`ClMx59rxXza_EDyed)%^EPpgB-
zCs~GLGx1P?S2<*7U9){Kq9r7>Ejup25t(M^1zT(E=|t5V$WwtFkke>*u@tYufD5$)
zhweWDJb7zWIEIcbj;<|AQ8po)PKsc;1UDxuwuMj%$&Tc6-WBmsXmPC+;a+2AH0_n5
z=qgzb{E;)rZXA-BD28KkrxmYIsCr)Lz+=T$$o_?u7S$>0SkbI$Zh8`B37@owPjeW=
zel7dPpvsVnFqE%Y5BqUZD&#FpoWwUECw0luUS$HTMjW7$47^58AZ@~@WX2Ofw7`$=
z$#VBr>>~`MH<c(mIF`pFN4q)7bcraZw?Z{Kh5Vt)%yh8YfhBg3EmE)dgz<nM6%@;7
zrC&YTyB;c<kweFA?6lIS9{jc>x=zVO_HDR@Pq1py_bw`~KqG({&>njve+_@o`Yxvu
zLk%NkW)kS|9buF*mkgu;VnVQ>30I|FX3lVBqtFz8Ep*S1$2%w6=Zk#lVYM>Zzl~T<
A>Hq)$

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 324914a..d61bb91 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -50,6 +50,14 @@ RSpec.configure do |config|
     fill_in 'user[password]', with: @user.password
     click_on 'Sign in'
   end
+
+  def create_pages_tree
+    root1 = Page.create(name: 'root1', locale: 'en')
+    root2 = Page.create(name: 'root2', locale: 'en')
+    child1_1 = Page.create( name: 'child1.1', locale: 'en', parent: root1 )
+    child2_1 = Page.create( name: 'child2.1', locale: 'en', parent: root2 )
+    child2_2 = Page.create( name: 'child2.2', locale: 'en', parent: root2 )
+  end
   # ## Mock Framework
   #
   # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line: