Skip to content

Commit

Permalink
Merge branch 'ney-bug-6651' into components-5.15.x
Browse files Browse the repository at this point in the history
  • Loading branch information
SilverYoCha committed Nov 20, 2015
2 parents 43a0abc + da113c1 commit 70c17e4
Showing 1 changed file with 19 additions and 11 deletions.
Expand Up @@ -20,16 +20,6 @@
*/
package org.silverpeas.kmelia.web;

import java.net.URI;
import javax.ws.rs.Consumes;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import com.silverpeas.annotation.Authorized;
import com.silverpeas.annotation.RequestScoped;
import com.silverpeas.annotation.Service;
Expand All @@ -40,6 +30,18 @@
import com.stratelia.webactiv.util.publication.model.PublicationDetail;
import com.stratelia.webactiv.util.publication.model.PublicationRuntimeException;
import org.silverpeas.publication.web.PublicationEntity;

import javax.ws.rs.Consumes;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import java.net.URI;

import static com.stratelia.webactiv.util.JNDINames.KMELIABM_EJBHOME;

/**
Expand Down Expand Up @@ -104,7 +106,13 @@ public Response savePublication(@PathParam("nodeId") String nodeId,
public Response updatePublication(final PublicationEntity publicationEntity) {
try {
PublicationDetail publication = publicationEntity.toPublicationDetail();


// Publication status is a mandatory data into the context of publication update.
// As this data is not handled by this service, it is retrieved from the silverpeas data
// before performing the update.
publication.setStatus(getKmeliaBm().getPublicationDetail(publication.getPK()).getStatus());

// Now, the update can be performed
getKmeliaBm().updatePublication(publication);

URI publicationURI = getUriInfo().getRequestUriBuilder().path(publication.getPK().getId())
Expand Down

0 comments on commit 70c17e4

Please sign in to comment.