Changeset 5075 for trunk/www/common/annotations/index.jsp

Timestamp:

Aug 24, 2009, 1:05:40 PM (14 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1361: Unhandled item: ANNOTATION

The only "issue" is that there is no "view" page for annotations. So the "edit" page is used for that as well. The "Save" button will be disabled if the current user doesn't have write permission.

File:

• trunk/www/common/annotations/index.jsp (modified) (3 diffs)

trunk/www/common/annotations/index.jsp

@@ -29 +29 @@
   import="net.sf.basedb.core.ItemContext"
   import="net.sf.basedb.core.BasicItem"
+  import="net.sf.basedb.core.Annotation"
+  import="net.sf.basedb.core.AnnotationType"
   import="net.sf.basedb.core.Annotatable"
   import="net.sf.basedb.core.BaseException"
@@ -44 +46 @@
 final String ID = sc.getId();
 final String cmd = request.getParameter("cmd");
-final Item itemType = Item.valueOf(request.getParameter("item_type"));
 final int itemId = Values.getInt(request.getParameter("item_id"));
 
@@ -54 +55 @@
 try
 {
-  if ("SaveAnnotations".equals(cmd))
+  if ("EditItem".equals(cmd))
   {
+    newDc = sc.newDbControl();
+    Annotation a = Annotation.getById(newDc, itemId);
+    AnnotationType at = a.getAnnotationType();
+    Annotatable item = a.getAnnotationSet().getItem();
+    
+    redirect = "annotate.jsp?ID=" + ID + "&item_id=" + item.getId() + 
+        "&item_type=" + item.getType().name() + 
+        "&annotationtype_id=" + at.getId() + "&standalone=1";
+    newDc.close();
+  }
+  else if ("SaveAnnotations".equals(cmd))
+  {
+    final Item itemType = Item.valueOf(request.getParameter("item_type"));
     newDc = sc.newDbControl();
     oldDc = sc.newDbControl();