svn commit: r931222 - in /ofbiz/trunk/framework/webtools/webapp/webtools: WEB-INF/actions/artifactinfo/ArtifactInfo.groovy artifactinfo/ArtifactInfo.ftl

[lektran]

Author: lektran
Date: Tue Apr  6 17:00:05 2010
New Revision: 931222

URL: http://svn.apache.org/viewvc?rev=931222&view=rev
Log:
Store the ArtifactInfo's Recently Viewed Artifacts list in the session as basic 
maps instead of ArtifactInfoBase objects that aren't serializable.

Modified:
    
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy
    ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl

Modified: 
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy?rev=931222&r1=931221&r2=931222&view=diff
==============================================================================
--- 
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy
 (original)
+++ 
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy
 Tue Apr  6 17:00:05 2010
@@ -49,15 +49,16 @@ if ("search".equals(parameters.findType)
 }
 
 if (artifactInfo) {
+    artifactInfoMap = [type : artifactInfo.getType(), uniqueId : 
artifactInfo.getUniqueId(), displayName : artifactInfo.getDisplayName()];
     // add to the recently viewed list
     recentArtifactInfoList = session.getAttribute("recentArtifactInfoList");
     if (!recentArtifactInfoList) {
         recentArtifactInfoList = FastList.newInstance();
         session.setAttribute("recentArtifactInfoList", recentArtifactInfoList);
     }
-    if (recentArtifactInfoList && 
recentArtifactInfoList.get(0).equals(artifactInfo)) {
+    if (recentArtifactInfoList && 
recentArtifactInfoList.get(0).equals(artifactInfoMap)) {
         // hmmm, I guess do nothing if it's already there
     } else {
-        recentArtifactInfoList.add(0, artifactInfo);
+        recentArtifactInfoList.add(0, artifactInfoMap);
     }
 }

Modified: 
ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl?rev=931222&r1=931221&r2=931222&view=diff
==============================================================================
--- 
ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl 
(original)
+++ 
ofbiz/trunk/framework/webtools/webapp/webtools/artifactinfo/ArtifactInfo.ftl 
Tue Apr  6 17:00:05 2010
@@ -23,7 +23,7 @@ under the License.
     <#assign highRef = sessionAttributes.recentArtifactInfoList.size() - 1/>
     <#if (highRef > 19)><#assign highRef = 19/></#if>
     <#list sessionAttributes.recentArtifactInfoList[0..highRef] as 
recentArtifactInfo>
-        <div>${recentArtifactInfo_index + 1} - 
${recentArtifactInfo.getDisplayType()}: <@displayArtifactInfoLink 
artifactInfo=recentArtifactInfo/></div>
+        <div>${recentArtifactInfo_index + 1} - ${recentArtifactInfo.type}: 
<@displayArtifactInfoLink type=recentArtifactInfo.type 
uniqueId=recentArtifactInfo.uniqueId 
displayName=recentArtifactInfo.displayName/></div>
     </#list>
   </div>
 </#if>
@@ -70,7 +70,7 @@ under the License.
     <div>
         <h4>Multiple Artifacts Found:</h4>
         <#list artifactInfoSet as curArtifactInfo>
-            <div>${curArtifactInfo.getDisplayType()}: 
<@displayArtifactInfoLink artifactInfo=curArtifactInfo/></div>
+            <div>${curArtifactInfo.getDisplayType()}: <@displayArtifactInfo 
artifactInfo=curArtifactInfo/></div>
         </#list>
     </div>
     </#if>
@@ -371,11 +371,11 @@ under the License.
 
 <#-- ==================== MACROS ===================== -->
 <#macro displayEntityArtifactInfo entityArtifactInfo>
-    <div>&nbsp;-&nbsp;<@displayArtifactInfoLink 
artifactInfo=entityArtifactInfo/></div>
+    <div>&nbsp;-&nbsp;<@displayArtifactInfo 
artifactInfo=entityArtifactInfo/></div>
 </#macro>
 
 <#macro displayServiceArtifactInfo serviceArtifactInfo>
-    <div>&nbsp;-&nbsp;<@displayArtifactInfoLink 
artifactInfo=serviceArtifactInfo/></div>
+    <div>&nbsp;-&nbsp;<@displayArtifactInfo 
artifactInfo=serviceArtifactInfo/></div>
 </#macro>
 
 <#macro displayServiceEcaArtifactInfo serviceEcaArtifactInfo>
@@ -415,21 +415,25 @@ under the License.
 </#macro>
 
 <#macro displayFormWidgetArtifactInfo formWidgetArtifactInfo>
-    <div>&nbsp;-&nbsp;<@displayArtifactInfoLink 
artifactInfo=formWidgetArtifactInfo/></div>
+    <div>&nbsp;-&nbsp;<@displayArtifactInfo 
artifactInfo=formWidgetArtifactInfo/></div>
 </#macro>
 
 <#macro displayScreenWidgetArtifactInfo screenWidgetArtifactInfo>
-    <div>&nbsp;-&nbsp;<@displayArtifactInfoLink 
artifactInfo=screenWidgetArtifactInfo/></div>
+    <div>&nbsp;-&nbsp;<@displayArtifactInfo 
artifactInfo=screenWidgetArtifactInfo/></div>
 </#macro>
 
 <#macro displayControllerRequestArtifactInfo controllerRequestArtifactInfo>
-    <div>&nbsp;-&nbsp;<@displayArtifactInfoLink 
artifactInfo=controllerRequestArtifactInfo/></div>
+    <div>&nbsp;-&nbsp;<@displayArtifactInfo 
artifactInfo=controllerRequestArtifactInfo/></div>
 </#macro>
 
 <#macro displayControllerViewArtifactInfo controllerViewArtifactInfo>
-    <div>&nbsp;-&nbsp;<@displayArtifactInfoLink 
artifactInfo=controllerViewArtifactInfo/></div>
+    <div>&nbsp;-&nbsp;<@displayArtifactInfo 
artifactInfo=controllerViewArtifactInfo/></div>
 </#macro>
 
-<#macro displayArtifactInfoLink artifactInfo>
-<a 
href="<@ofbizUrl>ArtifactInfo?type=${artifactInfo.getType()}&amp;uniqueId=${artifactInfo.getUniqueId()?url('ISO-8859-1')}</@ofbizUrl>">${artifactInfo.getDisplayName()}</a>
+<#macro displayArtifactInfo artifactInfo>
+    <@displayArtifactInfoLink type=artifactInfo.getType() 
uniqueId=artifactInfo.getUniqueId() displayName=artifactInfo.getDisplayName()/>
+</#macro>
+
+<#macro displayArtifactInfoLink type uniqueId displayName>
+<a 
href="<@ofbizUrl>ArtifactInfo?type=${type}&amp;uniqueId=${uniqueId?url('ISO-8859-1')}</@ofbizUrl>">${displayName}</a>
 </#macro>