summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael.c.conway@gmail.com>2013-02-15 19:37:16 (GMT)
committer mconway <michael.c.conway@gmail.com>2013-02-15 19:37:16 (GMT)
commita0b1644912dcc14325344b3e988b0c27d146d32a (patch)
treede3ea0bb3d074675e8a6185f68817632efb61b4e
parent59eaf16598bd4a323b82017f8542b794542acf63 (diff)
downloadQCG-Data-a0b1644912dcc14325344b3e988b0c27d146d32a.zip
QCG-Data-a0b1644912dcc14325344b3e988b0c27d146d32a.tar.gz
QCG-Data-a0b1644912dcc14325344b3e988b0c27d146d32a.tar.bz2
[#1119] Error when updating profile.
-rwxr-xr-xidrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy2
-rwxr-xr-xidrop-web/grails-app/controllers/org/irods/mydrop/controller/ProfileController.groovy9
-rwxr-xr-xidrop-web/release_notes.txt6
3 files changed, 12 insertions, 5 deletions
diff --git a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy
index 8a01a42..9926abd 100755
--- a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy
+++ b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy
@@ -192,7 +192,7 @@ class LoginController {
}
def logout = {
- session["SPRING_SECURITY_CONTEXT"] = null
+ session.invalidate()
redirect(action:"login")
}
diff --git a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/ProfileController.groovy b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/ProfileController.groovy
index 2bb2aef..39db3d9 100755
--- a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/ProfileController.groovy
+++ b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/ProfileController.groovy
@@ -101,8 +101,8 @@ class ProfileController {
userProfile = profileService.retrieveProfile(irodsAccount)
} catch (Exception e) {
log.error("error retrieving user profile", e)
- def message = message("message.cannot.create.profile")
- response.sendError(500, message)
+ flash.error = e.message
+ render(view:"index", model:[userProfile:profileCommand])
return
}
@@ -127,10 +127,11 @@ class ProfileController {
profileService.updateProfile(irodsAccount, userProfile)
} catch (Exception e) {
log.error("error updating user profile", e)
- def message = message("message.cannot.create.profile")
- response.sendError(500, message)
+ flash.error = e.message
+ render(view:"index", model:[userProfile:profileCommand])
return
}
+
log.info "updated"
flash.message = message(code:"message.update.successful")
diff --git a/idrop-web/release_notes.txt b/idrop-web/release_notes.txt
index 6541a21..13d7892 100755
--- a/idrop-web/release_notes.txt
+++ b/idrop-web/release_notes.txt
@@ -23,6 +23,12 @@ Note that the following bug and feature requests are logged in GForge with relat
*[#1205] error accessing tickets (-80600) on srbbrick15
**more gracefully handle ticket errors in display
+*[#1204] cleanup initial view (should be info)
+**Added re-initialization of tree location when returning back to the Browse tab from elsewhere, or on a reload
+
+*[#1119] Error when updating profile.
+**Better error trapping when an exception occurs updating the profile
+
==Features==
*[#984] iDrop web '2.0' redesign effort