Scarab commit: svn commit: r10231 - branches/release/b21/src/java/org/tigris/scarab/actions/ModifyIssue.java

Author: dabbous
Date: 2006-07-31 15:19:06-0700
New Revision: 10231

Modified:
   branches/release/b21/src/java/org/tigris/scarab/actions/ModifyIssue.java

Log:
Applied patched to SCB1630 and SCB1738

Modified: branches/release/b21/src/java/org/tigris/scarab/actions/ModifyIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/actions/ModifyIssue.java?view=diff&rev=10231&p1=branches/release/b21/src/java/org/tigris/scarab/actions/ModifyIssue.java&p2=branches/release/b21/src/java/org/tigris/scarab/actions/ModifyIssue.java&r1=10230&r2=10231
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/actions/ModifyIssue.java	(original)
+++ branches/release/b21/src/java/org/tigris/scarab/actions/ModifyIssue.java	2006-07-31 15:19:06-0700
@@ -504,20 +504,27 @@
             String dataFieldString = dataField.toString();
             if (dataFieldString != null && dataFieldString.trim().length() > 0)
             {
-                // create the new attachment
-                Attachment attachment = AttachmentManager.getInstance();
-                // set the form data to the attachment object
-                newGroup.setProperties(attachment);
-                activitySet = issue.addUrl(attachment, user);
-
-                // remove the group
-                intake.remove(newGroup);
-                scarabR.setConfirmMessage(L10NKeySet.UrlSaved);
-                NotificationManagerFactory.getInstance()
-                        .addActivityNotification(
-                                ActivityType.URL_ADDED, activitySet,
-                                issue, user);
-                
+                if (intake.isAllValid())
+                {
+                    // create the new attachment
+                    Attachment attachment = AttachmentManager.getInstance();
+                    // set the form data to the attachment object
+                    newGroup.setProperties(attachment);
+                    activitySet = issue.addUrl(attachment, user);
+
+                    // remove the group
+                    intake.remove(newGroup);
+                    scarabR.setConfirmMessage(L10NKeySet.UrlSaved);
+                    NotificationManagerFactory.getInstance()
+                            .addActivityNotification(
+                                    ActivityType.URL_ADDED, activitySet,
+                                    issue,
+                                    user);
+                }
+                else
+                {
+                     scarabR.setAlertMessage(ERROR_MESSAGE);
+                }
             }
         }
     }