Little refactoring

git-svn-id: file:///opt/svn/repos-elessar/jAPS2/trunk@33679 7c63eed8-93cd-11dc-84e7-3b7bcc207536
EntandoOldVersions · Jun 12, 2011 · d3e7992 · d3e7992
1 parent ddb3f77
commit d3e7992
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/WebContent/WEB-INF/plugins/jacms/apsadmin/jsp/content/contentDetails.jsp b/WebContent/WEB-INF/plugins/jacms/apsadmin/jsp/content/contentDetails.jsp
@@ -34,16 +34,15 @@
 
 	<p class="noscreen" id="jpcontentinspection_metadata"><s:text name="title.metadata" /></p>
 
-	<jacmswpsa:content contentId="%{content.id}" record="true" var="contentRecordVar" />
 	<dl class="table-display">
 		<dt><s:text name="label.key" /></dt>
 			<dd><s:property value="content.id" /></dd>
 		<dt><s:text name="label.description" /></dt>
 			<dd><s:property value="content.descr" /></dd>
 		<dt><s:text name="label.lastEdit" /></dt>
-			<dd><s:date name="#contentRecordVar.modify" format="dd/MM/yyyy HH:mm" /></dd>
+			<dd><s:date name="content.lastModified" format="dd/MM/yyyy HH:mm" /></dd>
 		<dt><s:text name="label.creationDate" /></dt>
-			<dd><s:date name="#contentRecordVar.create" format="dd/MM/yyyy HH:mm" /></dd>
+			<dd><s:date name="content.created" format="dd/MM/yyyy HH:mm" /></dd>
 		<dt><s:text name="label.editor" /></dt>
 			<dd><s:property value="content.lastEditor" /></dd>
 		<dt><s:text name="name.version" /></dt>

diff --git a/...NF/plugins/jacms/apsadmin/jsp/content/modules/include/hypertextAttribute/fck_japslink.jsp b/...NF/plugins/jacms/apsadmin/jsp/content/modules/include/hypertextAttribute/fck_japslink.jsp
@@ -251,12 +251,12 @@ window.close();
 <!-- //URL Link -->
 
 <!-- //Page Link -->
-<s:action name="introPageLink" namespace="/do/jacms/Content/Hypertext" executeResult="true" ></s:action>
+<s:action name="introPageLink" executeResult="true" ></s:action>
 
 <!-- Content Link -->
 <s:if test="#request.activeTab == 2 && null != #request.internalActionName"><s:set var="introContentLinkActionName" value="#request.internalActionName" ></s:set></s:if>
 <s:else><s:set var="introContentLinkActionName" value="'introContentLink'" ></s:set></s:else>
-<s:action name="%{#introContentLinkActionName}" namespace="/do/jacms/Content/Hypertext" executeResult="true"></s:action>
+<s:action name="%{#introContentLinkActionName}" executeResult="true"></s:action>
 
 </div>
 

diff --git a/...etec/plugins/jacms/apsadmin/content/attribute/action/resource/ExtendedResourceAction.java b/...etec/plugins/jacms/apsadmin/content/attribute/action/resource/ExtendedResourceAction.java
@@ -63,8 +63,9 @@ private void buildEntryContentAnchorDest() {
 	@Override
 	public List<Group> getAllowedGroups() {
 		List<Group> groups = new ArrayList<Group>();
-		groups.add(this.getGroupManager().getGroup(Group.FREE_GROUP_NAME));
-		//TODO DA VERIFICARE SE CHIUNQUE PUO' AGGIUNGERE UNA RISORSA FREE
+		if (this.isCurrentUserMemberOf(Group.FREE_GROUP_NAME)) {
+			groups.add(this.getGroupManager().getGroup(Group.FREE_GROUP_NAME));
+		}
 		String contentMainGroup = this.getContent().getMainGroup();
 		if (contentMainGroup != null && !contentMainGroup.equals(Group.FREE_GROUP_NAME)) {
 			groups.add(this.getGroupManager().getGroup(contentMainGroup));