ENG-5491: Prefill owner group by user preferences

Author: eugeniosant

cms-plugin/src/main/java/com/agiletec/plugins/jacms/apsadmin/content/ContentAction.java

@@ -82,6 +82,7 @@ public void validate() {
      * @return Il codice del risultato dell'azione.
      */
     public String edit() {
+        this.getRequest().getSession().removeAttribute(ContentActionConstants.SESSION_PARAM_NAME_CURRENT_CONTENT_GROUP);
         try {
             Content content = this.getContentManager().loadContent(this.getContentId(), false);
             if (null == content) {
@@ -107,6 +108,7 @@ public String edit() {
      * @return Il codice del risultato dell'azione.
      */
     public String copyPaste() {
+        this.getRequest().getSession().removeAttribute("contentGroupOnSession");
         try {
             Content content = this.getContentManager().loadContent(this.getContentId(), this.isCopyPublicVersion());
             if (null == content) {

cms-plugin/src/main/java/com/agiletec/plugins/jacms/apsadmin/content/IntroNewContentAction.java

@@ -20,6 +20,7 @@
 import com.agiletec.apsadmin.system.ApsAdminSystemConstants;
 import com.agiletec.plugins.jacms.aps.system.services.content.model.Content;
 import java.util.Arrays;
+import javax.servlet.http.HttpSession;
 import org.apache.commons.lang.StringUtils;
 import org.entando.entando.aps.system.services.userpreferences.IUserPreferencesManager;
 import org.entando.entando.aps.system.services.userpreferences.UserPreferences;
@@ -80,6 +81,7 @@ public String createNew() {
                 _logger.debug("Invalid content type");
                 return INPUT;
             }
+            this.getRequest().getSession().removeAttribute(ContentActionConstants.SESSION_PARAM_NAME_CURRENT_CONTENT_GROUP);
             prototype.setFirstEditor(username);
             UserPreferences pref = this.getUserPreferencesManager().getUserPreferences(username);
             if (pref != null) {
@@ -94,7 +96,7 @@ public String createNew() {
                             });
                 }
                 if (StringUtils.isNotBlank(defaultContentOwnerGroup) && null != this.getGroup(defaultContentOwnerGroup)) {
-                    prototype.setMainGroup(defaultContentOwnerGroup);
+                    this.getRequest().getSession().setAttribute(ContentActionConstants.SESSION_PARAM_NAME_CURRENT_CONTENT_GROUP, defaultContentOwnerGroup);
                     _logger.info("setting ownerGroup to {}", defaultContentOwnerGroup);
                 }
             }
@@ -107,12 +109,14 @@ public String createNew() {
     }
 
 	protected void fillSessionAttribute(Content prototype) {
-		if (this.getAuthorizationManager().isAuthOnGroup(this.getCurrentUser(), Group.FREE_GROUP_NAME)) {
-			this.getRequest().getSession().setAttribute(ContentActionConstants.SESSION_PARAM_NAME_CURRENT_CONTENT_GROUP, Group.FREE_GROUP_NAME);
+        HttpSession session = this.getRequest().getSession();
+		if (null == session.getAttribute(ContentActionConstants.SESSION_PARAM_NAME_CURRENT_CONTENT_GROUP) 
+                && this.getAuthorizationManager().isAuthOnGroup(this.getCurrentUser(), Group.FREE_GROUP_NAME)) {
+			session.setAttribute(ContentActionConstants.SESSION_PARAM_NAME_CURRENT_CONTENT_GROUP, Group.FREE_GROUP_NAME);
 		}
 		String marker = buildContentOnSessionMarker(prototype, ApsAdminSystemConstants.ADD);
 		super.setContentOnSessionMarker(marker);
-		this.getRequest().getSession().setAttribute(ContentActionConstants.SESSION_PARAM_NAME_CURRENT_CONTENT_PREXIX + marker, prototype);
+		session.setAttribute(ContentActionConstants.SESSION_PARAM_NAME_CURRENT_CONTENT_PREXIX + marker, prototype);
 		_logger.debug("Created ed inserted on session content prototype of type {}", prototype.getTypeCode());
 	}
 

cms-plugin/src/main/webapp/WEB-INF/plugins/jacms/apsadmin/jsp/content/entryContent.jsp

@@ -100,8 +100,10 @@
                 </s:if>
                 <s:else>
                     <div class="input-group">
+                        <s:set var="contentGroupOnSessionVar">${session.contentGroupOnSession}</s:set>
+                        <s:property value="#contentGroupOnSessionVar" />
                         <wpsf:select name="mainGroup" id="contentMainGroup" list="allowedGroups"
-                                     value="#session.contentGroupOnSession"
+                                     value="#contentGroupOnSessionVar"
                                      listKey="name" listValue="descr" cssClass="form-control" />
                         <span class="input-group-btn">
                             <wpsf:submit action="configureMainGroup"