Changeset 7493

Timestamp:

03/19/09 11:36:51 (17 months ago)

Author:

dragisak

Message:

Bug fix: Journal object needs to be initialized before returning to adminTop.

Also:

• Add URI checking.
• Handle whitespaces around article URI.

Addresses #1198

Files:

• head/ambra/webapp/src/main/java/org/topazproject/ambra/admin/action/DeleteArticleAction.java (modified) (3 diffs)

head/ambra/webapp/src/main/java/org/topazproject/ambra/admin/action/DeleteArticleAction.java

@@ -24 +24 @@
 import org.topazproject.ambra.admin.service.AdminService;
 import org.topazproject.ambra.admin.service.AdminService.JournalInfo;
+import org.topazproject.otm.RdfUtil;
 import org.springframework.beans.factory.annotation.Required;
 
@@ -39 +40 @@
   @Override
   public String execute() throws Exception {
+    if (article != null)
+      article = article.trim();
+
     try {
+      RdfUtil.validateUri(article, "Article Uri");
       getDocumentManagementService().delete(article);
       addActionMessage("Successfully deleted article: " + article);
@@ -54 +59 @@
     }
 
+    // create a faux journal object for template
+    journalInfo = adminService.createJournalInfo();
     return base();
   }