Merge pull request #256 from fism88/master

Fixing some errors in updating Profile
w7cook · May 1, 2012 · 7dd5b42 · 7dd5b42
2 parents 184537c + 746a665
commit 7dd5b42
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/app/controllers/Profiles.java b/app/controllers/Profiles.java
@@ -32,7 +32,7 @@ public static void updateBio(String bio){
       profile.bio = "";
 
     profile.save();
-    renderTemplate("Application/edit_basic.html", profile);
+    renderTemplate("Users/profile.html", profile);
   }
 
   public static void updateInformation(String birthday, String relationshipStatus, String gender, String interestedIn,
@@ -50,10 +50,12 @@ public static void updateInformation(String birthday, String relationshipStatus,
     profile.gender = gender;
     profile.interestedIn = interestedIn;
     DateFormat anniversary_formatting = new SimpleDateFormat("MM/dd/yyyy");
-    try {
-      profile.anniversary = (Date) anniversary_formatting.parse(anniversary);
-    } catch (java.text.ParseException e) {
-      e.printStackTrace();
+    if(anniversary != null){
+      try {
+        profile.anniversary = (Date) anniversary_formatting.parse(anniversary);
+      } catch (java.text.ParseException e) {
+        e.printStackTrace();
+      }
     }
     //        profile.relationshipStatus = relationshipStatus;
 
@@ -66,7 +68,7 @@ public static void updateInformation(String birthday, String relationshipStatus,
 
     profile.political = political;
     profile.save();
-    renderTemplate("Application/edit_basic.html", profile);
+    renderTemplate("Users/profile.html", profile);
   }
 
   public static void updateContactInfo(String phone, String address){
@@ -92,7 +94,7 @@ public static void updateContactInfo(String phone, String address){
       profile.address = "";
 
     profile.save();
-    renderTemplate("Application/edit_basic.html", profile);
+    renderTemplate("Users/profile.html", profile);
   }
 
   public static void updateWorkEdu(String edu, String work){
@@ -124,7 +126,7 @@ public static void updateWorkEdu(String edu, String work){
       profile.work.add(employment);
     */
     profile.save();
-    renderTemplate("Application/edit_basic.html", profile);
+    renderTemplate("Users/profile.html", profile);
   }
 
   public static void updateLiving(String hometown){
@@ -143,7 +145,7 @@ public static void updateLiving(String hometown){
       profile.hometown = null;
 
     profile.save();
-    renderTemplate("Application/edit_basic.html", profile);
+    renderTemplate("Users/profile.html", profile);
   }
 
   public static void updateQuote(String quotation){
@@ -156,6 +158,6 @@ public static void updateQuote(String quotation){
       profile.quotes = "";
 
     profile.save();
-    renderTemplate("Application/edit_basic.html", profile);
+    renderTemplate("Users/profile.html", profile);
   }
 }