You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2009/12/23 00:46:50 UTC

svn commit: r893351 - in /portals/jetspeed-2/applications/j2-admin/trunk/src/main: java/org/apache/jetspeed/portlets/spaces/ webapp/WEB-INF/view/spaces/

Author: taylor
Date: Tue Dec 22 23:46:50 2009
New Revision: 893351

URL: http://svn.apache.org/viewvc?rev=893351&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-1084
cleanup of Page and Space managment, bug fixes

Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/SpaceNavigator.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/SpacesManager.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/space-navigator.jsp

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java?rev=893351&r1=893350&r2=893351&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/PageNavigator.java Tue Dec 22 23:46:50 2009
@@ -154,22 +154,19 @@
         
         if (addPage != null)
         {
-            addPage = addPage.replace(' ', '_');
             Space space = (Space)actionRequest.getPortletSession().getAttribute("space");
             
             if (space != null)
             {
                 String spacePath = space.getPath();
-                
                 try
                 {
-                    String path = spacePath + "/" + addPage + ".psml";
-                    
+                    String pageName = addPage.replace(' ', '_');                
+                    String path = spacePath + "/" + pageName + ".psml";                    
                     Page source = pageManager.getPage("/_user/template/min.psml");                
                     Page newPage = pageManager.copyPage(source, path);
                     newPage.setTitle(addPage);
-                    pageManager.updatePage(newPage);
-                    
+                    pageManager.updatePage(newPage);                    
                     actionRequest.getPortletSession().removeAttribute("pages");
                     actionRequest.getPortletSession().removeAttribute("links");
                     String redirect = admin.getPortalURL(actionRequest, actionResponse, path);

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/SpaceNavigator.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/SpaceNavigator.java?rev=893351&r1=893350&r2=893351&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/SpaceNavigator.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/SpaceNavigator.java Tue Dec 22 23:46:50 2009
@@ -121,7 +121,6 @@
         String spaceName = actionRequest.getParameter("space");
         if (spaceName != null)
         {
-            spaceName = spaceName.replace(' ', '_');
             Space space = getSpaceFromName(spaceName);
             if (space != null)
             {

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/SpacesManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/SpacesManager.java?rev=893351&r1=893350&r2=893351&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/SpacesManager.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/SpacesManager.java Tue Dec 22 23:46:50 2009
@@ -117,14 +117,15 @@
         {
             try
             {
-                String spacePath = "/" + name; // TODO: make this configurable
+                String folderName = name.replace(' ', '_');                                
+                String spacePath = "/" + folderName; // TODO: make this configurable
                 System.out.println("adding space named = " + spacePath);
                 Folder folder = pageManager.newFolder(spacePath);
                 folder.setDefaultDecorator(theme, Fragment.LAYOUT);
                 folder.setDefaultDecorator(theme, Fragment.PORTLET);
                 GenericMetadata metadata = folder.getMetadata();
                 metadata.addField(Locale.ENGLISH, "space-owner", actionRequest.getUserPrincipal().getName());
-                folder.setTitle(title);
+                folder.setTitle((title == null) ? name : title);
                 pageManager.updateFolder(folder);
                 //add default page
                 Page source = pageManager.getPage("/_user/template/space-home.psml");                

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp?rev=893351&r1=893350&r2=893351&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/page-navigator.jsp Tue Dec 22 23:46:50 2009
@@ -44,7 +44,7 @@
 List<MenuElement> linkElements = (List<MenuElement>) renderRequest.getAttribute("spaceLinkElements");
 %>
 <table>
-	<tr><td class="portlet-section-body"><b><%=space.getName() %> Space</b></td> </tr>
+	<tr><td class="portlet-section-body"><b><%=space.getTitle() %> Space</b></td> </tr>
 <%
 for (MenuElement element : menuElements)
 {

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/space-navigator.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/space-navigator.jsp?rev=893351&r1=893350&r2=893351&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/space-navigator.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/spaces/space-navigator.jsp Tue Dec 22 23:46:50 2009
@@ -30,7 +30,7 @@
 	Space current = ((Space)renderRequest.getAttribute("space"));
 %>
 		<ul id="nav-top">
-			<li><a href="<portlet:actionURL><portlet:param name='space' value='<%=current.getName()%>'/></portlet:actionURL>" title="<%= current.getName() %>"><%= current.getName() %></a>
+			<li><a href="<portlet:actionURL><portlet:param name='space' value='<%=current.getName()%>'/></portlet:actionURL>" title="<%=current.getTitle() %>"><%=current.getTitle() %></a>
 				<ul id="spaceList">
 <%
   int count = 0;
@@ -47,12 +47,15 @@
           extStyle = "font-weight: bold";
       }
 %>     
-<li <% if (style != null) { %>class="<%=style%>" <% } %>><a  <% if (extStyle != null) { %>style="<%=extStyle%>" <% } %>   href="<portlet:actionURL><portlet:param name='space' value='<%=space.getName()%>'/></portlet:actionURL>" title="<%=space.getName() %>"><%=space.getName() %></a></li>
+<li <% if (style != null) { %>class="<%=style%>" <% } %>><a  <% if (extStyle != null) { %>style="<%=extStyle%>" <% } %>   href="<portlet:actionURL><portlet:param name='space' value='<%=space.getName()%>'/></portlet:actionURL>" title="<%=space.getTitle() %>"><%=space.getTitle() %></a></li>
 <%
   count++;
   }
+  if (renderRequest.isUserInRole("admin"))
+  {
 %>
 			<li class="add"><a href="<portlet:actionURL><portlet:param name='navAction' value='addSpace'/></portlet:actionURL>" title="Add Space">Add Space</a></li>
 				</ul>
 			</li>
+<% } %>
 		</ul>
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org