Changeset 5075

Timestamp:

Aug 24, 2009, 1:05:40 PM (13 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.

Location:

trunk/www

Files:

• common/annotations/annotate.jsp (modified) (2 diffs)
• common/annotations/index.jsp (modified) (3 diffs)
• include/scripts/main.js (modified) (1 diff)

trunk/www/common/annotations/annotate.jsp

@@ -89 +89 @@
 
   final Annotatable item = itemId == 0 ? null : (Annotatable)itemType.getById(dc, itemId);
+  final boolean writePermission = item == null ? true : item.hasPermission(Permission.WRITE);
   Protocol protocol = null;
   boolean readProtocol = true;
@@ -871 +872 @@
       %>
       </div>
-      <table align="center">
-      <tr>
-        <td width="50%"><base:button onclick="saveAnnotations()" title="Save" /></td>
-        <td width="50%"><base:button onclick="window.close()" title="Cancel" /></td>
-      </tr>
-      </table>
+      <%
+      if (writePermission)
+      {
+        %>
+        <table align="center">
+        <tr>
+          <td width="50%"><base:button onclick="saveAnnotations()" title="Save" /></td>
+          <td width="50%"><base:button onclick="window.close()" title="Cancel" /></td>
+        </tr>
+        </table>
+        <%
+      }
+      else
+      {
+        %>
+        <div class="error">You do not have permission to change this information</div>
+        <table align="center">
+        <tr>
+          <td><base:button onclick="window.close()" title="Close" /></td>
+        </tr>
+        </table>
+        <%
+      }
+      %>
       <form name="modified" method="post" action="index.jsp?ID=<%=ID%>">
         <input type="hidden" name="cmd" value="SaveAnnotations">

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();

trunk/www/include/scripts/main.js

@@ -475 +475 @@
     this.controllers['UNIT'] = { url:'admin/quantities/units/index.jsp', width:600, height:480 };
     this.controllers['CHANGEHISTORY'] = { url:'common/history/index.jsp', width:600, height:480, edit:false, popup:true };
+    this.controllers['ANNOTATION'] = { url:'common/annotations/index.jsp', width:700, height:480, edit:true, popup:true };
   }