From 2168839b3d9c8a3363cf39ff969b2e1a07b5d032 Mon Sep 17 00:00:00 2001
From: Sara Renberg <sara.renberg@gmail.com>
Date: Thu, 12 Jan 2012 09:49:23 -0800
Subject: [PATCH] merging local changes

---
 src/.DS_Store                        | Bin 0 -> 6148 bytes
 src/classes/Milestone1_Summary2.cls  |  44 +++++----------------------
 src/objects/Milestone1_Nag__c.object |   2 +-
 3 files changed, 8 insertions(+), 38 deletions(-)
 create mode 100644 src/.DS_Store

diff --git a/src/.DS_Store b/src/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..6b00c119ce118c5ff593e15e1483b7815be09d91
GIT binary patch
literal 6148
zcmeHKyH3ME5S)cbM9`$9ykFoCtSEc|KL8|jCPp&!?)YtHABl*Zv=nGI+8y8C&Ye7k
zHw(blU%Llj1z<^c#J7jJ`M&$it}5ebamI)@jJt8$zYeqN^9kqPV2d6v82LN$hu#Ud
z+#2wX55_$=_xL<qkOk*YRaOc}0VyB_q<|E-qyT%i+wv|^Q3^-_DR5N4zYmS>*cDER
z@#$cQ5rDX0I*iXTOAwnUh+W~7$PCSrN=&NNh+#=*zExdUI3*?>7B};py4h+%vACW2
z7Ui%mQBev=fl~#pbGh>V|46?u|DTeyk^)lTUnyXV&C_PhSE}ARdpYm5js8qO7;B@P
mAzCppS}_;iitm5bHGk%QS2!gGo%x^>^+&*Ukx7BSP~Zm%UL1S?

literal 0
HcmV?d00001

diff --git a/src/classes/Milestone1_Summary2.cls b/src/classes/Milestone1_Summary2.cls
index a8b7bd3..074f3b3 100644
--- a/src/classes/Milestone1_Summary2.cls
+++ b/src/classes/Milestone1_Summary2.cls
@@ -45,9 +45,9 @@ public with sharing class Milestone1_Summary2 {
     }
     
     public boolean hasSearchLengthError{
-        get{
-            return searchLengthError != null && searchLengthError == true;
-        }
+    	get{
+    		return searchLengthError != null && searchLengthError == true;
+    	}
     }
     
     public boolean hasProjectResults {
@@ -261,7 +261,6 @@ public with sharing class Milestone1_Summary2 {
     }
 
     public Pagereference viewBlockedTasks() {
-        
         return new Pagereference('/' + settings.Report_Id_Blocked_Tasks_by_Project__c + '?pv0=' + String.valueOf(targetProject).substring(0,15) );
     }
 
@@ -283,17 +282,14 @@ public with sharing class Milestone1_Summary2 {
     }
 
     public Pagereference incompleteTasksByPriority() {
-    
         return new Pagereference('/' + settings.Report_Id_My_Tasks_By_Priority_Project__c + '?pv0=' + Encodingutil.urlEncode(''+UserInfo.getName(), 'UTF-8' ) );
     }
 
     public Pagereference summaryMyLateTasks() {
-    
         return new Pagereference('/' + settings.Report_Id_My_Late_Tasks__c + '?pv0=' + Encodingutil.urlEncode(''+UserInfo.getName(), 'UTF-8' ) );
     }
     
     public Pagereference summaryMyBlockedTasks() {
-    
         return new Pagereference('/' + settings.Report_Id_My_Blocked_Tasks__c + '?pv0=' + Encodingutil.urlEncode(''+UserInfo.getName(), 'UTF-8' ) );
     }
     
@@ -330,6 +326,7 @@ public with sharing class Milestone1_Summary2 {
 
         
         
+        
         //make sure we get page references back
         summary2.targetProject = p1.id;
         
@@ -361,40 +358,13 @@ public with sharing class Milestone1_Summary2 {
         
         if(summary2.hasNext == true)
         {
-            summary2.next();
+        	summary2.next();
         }
         if(summary2.hasPrevious == true)
         {
-            summary2.previous();
-        }
-        
-    }
-    
-    static TestMethod void testProjectPagination() {
-    
-        Integer i = 0;
-        
-        List<Milestone1_Project__c> projects = new List<Milestone1_Project__c>();
-        while (i < 25) {
-            Milestone1_Project__c p1 = Milestone1_Test_Utility.sampleProjectActive('Controller Test'+i);
-            projects.add(p1);
-            i++;
+        	summary2.previous();
         }
         
-        insert projects;
-        
-        //make sure it shows active projects
-        
-        Test.startTest();
-        
-        Milestone1_Summary2 summary2 = new Milestone1_Summary2();
-        
-        Integer i2 = summary2.getProjects().size();
-        
-        System.assertEquals(20, i2, 'Project count is wrong.');
-        
-        Test.stopTest();
-    
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/objects/Milestone1_Nag__c.object b/src/objects/Milestone1_Nag__c.object
index a2a4d9b..30f0424 100644
--- a/src/objects/Milestone1_Nag__c.object
+++ b/src/objects/Milestone1_Nag__c.object
@@ -215,8 +215,8 @@ IF( Project_Task__c &lt;&gt; null, &apos;Task&apos;,&apos;&apos;)))</formula>
     <pluralLabel>Nags</pluralLabel>
     <searchLayouts>
         <excludedStandardButtons>Accept</excludedStandardButtons>
-        <excludedStandardButtons>New</excludedStandardButtons>
         <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
+        <excludedStandardButtons>New</excludedStandardButtons>
     </searchLayouts>
     <sharingModel>ReadWrite</sharingModel>
     <validationRules>