Merge branch 'r.4.5.3'

JBEI · Oct 5, 2015 · c26490a · c26490a
2 parents 535b550 + 92f20a9
commit c26490a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.jbei</groupId>
     <artifactId>ice</artifactId>
     <packaging>war</packaging>
-    <version>4.5.2</version>
+    <version>4.5.3</version>
     <name>ice</name>
     <description>Inventory of Composable Elements (ICE) for Synthetic Biology</description>
     <repositories>

diff --git a/src/main/java/org/jbei/ice/services/rest/PartResource.java b/src/main/java/org/jbei/ice/services/rest/PartResource.java
@@ -9,6 +9,7 @@
 import org.glassfish.jersey.media.multipart.FormDataParam;
 import org.jbei.ice.lib.access.PermissionException;
 import org.jbei.ice.lib.access.PermissionsController;
+import org.jbei.ice.lib.account.SessionHandler;
 import org.jbei.ice.lib.common.logging.Logger;
 import org.jbei.ice.lib.dto.ConfigurationKey;
 import org.jbei.ice.lib.dto.History;
@@ -95,8 +96,10 @@ public ArrayList<PartData> autoComplete(@QueryParam("token") String token,
     @GET
     @Produces(MediaType.APPLICATION_JSON)
     @Path("/{id}")
-    public Response read(@Context final UriInfo info, @PathParam("id") final String id) {
-        final String userId = getUserId();
+    public Response read(@Context final UriInfo info,
+                         @HeaderParam(AUTHENTICATION_PARAM_NAME) String sessionId,
+                         @PathParam("id") final String id) {
+        String userId = SessionHandler.getUserIdBySession(sessionId);
         try {
             log(userId, "retrieving details for " + id);
             final EntryType type = EntryType.nameToType(id);

diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
@@ -90,7 +90,7 @@
             </div>
             <div class="text-right">
                 &copy;&nbsp;<a href="https://github.com/JBEI/ice">JBEI ICE Registry</a> <span
-                    class="label label-primary">v4.5.2</span><br>
+                    class="label label-primary">v4.5.3</span><br>
                 All rights reserved. <br>
                 <a href="https://github.com/JBEI/ice/issues/new">Submit an Issue</a>&nbsp; <span class="text-muted">|</span> &nbsp;<a
                     href="http://public-registry.jbei.org/manual">Help</a>