[jboss-svn-commits] JBL Code SVN: r7825 - in labs/jbossforums/branches/forums26/forums/src: main/org/jboss/portlet/forums/ui/action resources/portal-forums-war/views/topics

[jboss-svn-commits at lists.jboss.org]

Author: unibrew
Date: 2006-11-24 21:17:07 -0500 (Fri, 24 Nov 2006)
New Revision: 7825

Modified:
   labs/jbossforums/branches/forums26/forums/src/main/org/jboss/portlet/forums/ui/action/EditPost.java
   labs/jbossforums/branches/forums26/forums/src/main/org/jboss/portlet/forums/ui/action/NewTopic.java
   labs/jbossforums/branches/forums26/forums/src/main/org/jboss/portlet/forums/ui/action/PostAction.java
   labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/posting_edit_body.xhtml
   labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/posting_new_body.xhtml
Log:
[JBFORUMS-147] I repaired posting and editing attachments.

Modified: labs/jbossforums/branches/forums26/forums/src/main/org/jboss/portlet/forums/ui/action/EditPost.java
===================================================================
--- labs/jbossforums/branches/forums26/forums/src/main/org/jboss/portlet/forums/ui/action/EditPost.java	2006-11-25 02:06:03 UTC (rev 7824)
+++ labs/jbossforums/branches/forums26/forums/src/main/org/jboss/portlet/forums/ui/action/EditPost.java	2006-11-25 02:17:07 UTC (rev 7825)
@@ -34,6 +34,7 @@
 import org.jboss.portlet.forums.ui.JSFUtil;
 import org.jboss.portlet.forums.ui.PortalUtil;
 import org.jboss.portlet.forums.commands.ValidationException;
+import org.jboss.portlet.forums.commands.post.PostTools;
 import org.jboss.portlet.forums.model.Poll;
 import org.jboss.portlet.forums.model.PollOption;
 import org.jboss.portlet.forums.model.Message;
@@ -212,6 +213,7 @@
                     poll.setTitle(this.question);
                     poll.setLength(this.activeDuration);
                     poll.setOptions(localPollOptions);
+                    PostTools.validate(poll);
                     BaseController.getForumsModule().addPollToTopic(topic,poll);
                 }
             }

Modified: labs/jbossforums/branches/forums26/forums/src/main/org/jboss/portlet/forums/ui/action/NewTopic.java
===================================================================
--- labs/jbossforums/branches/forums26/forums/src/main/org/jboss/portlet/forums/ui/action/NewTopic.java	2006-11-25 02:06:03 UTC (rev 7824)
+++ labs/jbossforums/branches/forums26/forums/src/main/org/jboss/portlet/forums/ui/action/NewTopic.java	2006-11-25 02:17:07 UTC (rev 7825)
@@ -126,7 +126,7 @@
            //setup the poll related information
            Poll poll = PortalUtil.createPoll();
            if(this.question!=null && this.question.trim().length()>0)
-           { 
+           {
                poll.setTitle(this.question);               
                poll.setLength(this.activeDuration);
                List pollOptions = new ArrayList();
@@ -139,9 +139,8 @@
                    pollOptions.add(pollOption);
                }
                poll.setOptions(pollOptions);
+               PostTools.validate(poll);
            }
-           
-           PostTools.validate(poll);
                                  
            //actually create the topic in this forum
            //use this method when poll and attachments are actually integrated

Modified: labs/jbossforums/branches/forums26/forums/src/main/org/jboss/portlet/forums/ui/action/PostAction.java
===================================================================
--- labs/jbossforums/branches/forums26/forums/src/main/org/jboss/portlet/forums/ui/action/PostAction.java	2006-11-25 02:06:03 UTC (rev 7824)
+++ labs/jbossforums/branches/forums26/forums/src/main/org/jboss/portlet/forums/ui/action/PostAction.java	2006-11-25 02:17:07 UTC (rev 7825)
@@ -583,7 +583,17 @@
             JSFUtil.handleException(e);
         }
         return navState;
-    }    
+    } 
+    
+    /**
+     * 
+     * @author <a href="mailto:ryszard.kozmik at jboss.com">Ryszard Kozmik</a>
+     */
+    public String updateAttachment() {
+        return null;
+    }
+    
+    
     //------------preview-------------------------------------------------------------------------------------------------------    
     /**
      * 

Modified: labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/posting_edit_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/posting_edit_body.xhtml	2006-11-25 02:06:03 UTC (rev 7824)
+++ labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/posting_edit_body.xhtml	2006-11-25 02:17:07 UTC (rev 7825)
@@ -609,8 +609,8 @@
 			      <td class="row1"><span class="gen"><b>${resource.Options}</b></span></td>
 			      <td class="row2"><span class="genmed">			 	   	
 						&#160; 			
-						<h:commandButton action="updateAttachment" value="${resource.Update_comment}" styleClass="liteoption"/>	
-						&#160; 			
+						<h:commandButton action="#{editPost.updateAttachment}" value="${resource.Update_comment}" styleClass="liteoption"	
+						onclick="selectAttachment('${idx.index}');"/> &#160; 			
 						<h:commandButton action="#{editPost.deleteAttachment}" value="${resource.Delete_attachment}" styleClass="liteoption" 
 						onclick="selectAttachment('${idx.index}');"/>            		
 			       </span>

Modified: labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/posting_new_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/posting_new_body.xhtml	2006-11-25 02:06:03 UTC (rev 7824)
+++ labs/jbossforums/branches/forums26/forums/src/resources/portal-forums-war/views/topics/posting_new_body.xhtml	2006-11-25 02:17:07 UTC (rev 7825)
@@ -606,7 +606,8 @@
 		      <td class="row1"><span class="gen"><b>${resource.Options}</b></span></td>
 		      <td class="row2"><span class="genmed">			 	   	
 					&#160; 			
-					<h:commandButton action="updateAttachment" value="${resource.Update_comment}" styleClass="liteoption"/>	
+					<h:commandButton action="#{newTopic.updateAttachment}" value="${resource.Update_comment}" styleClass="liteoption"
+                                        onclick="selectAttachment('${idx.index}');"/>	
 					&#160; 			
 					<h:commandButton action="#{newTopic.deleteAttachment}" value="${resource.Delete_attachment}" styleClass="liteoption" 
 					onclick="selectAttachment('${idx.index}');"/>