Changeset 5070

Timestamp:

Aug 20, 2009, 11:15:14 AM (14 years ago)

Author:

Nicklas Nordborg

Message:

References #108: Logging the change history of an item

• Enabled logging for annotation types

Location:

trunk

Files:

• src/core/net/sf/basedb/core/data/AnnotationTypeData.java (modified) (1 diff)
• www/admin/annotationtypes/view_annotationtype.jsp (modified) (5 diffs)

trunk/src/core/net/sf/basedb/core/data/AnnotationTypeData.java

@@ -41 +41 @@
 public class AnnotationTypeData
   extends CommonData
-  implements RegisteredData
+  implements RegisteredData, LoggableData
 {
 

trunk/www/admin/annotationtypes/view_annotationtype.jsp

@@ -48 +48 @@
   import="net.sf.basedb.core.query.Hql"
   import="net.sf.basedb.clients.web.Base"
+  import="net.sf.basedb.clients.web.ChangeHistoryUtil"
   import="net.sf.basedb.clients.web.PermissionUtil"
   import="net.sf.basedb.clients.web.util.HTML"
@@ -77 +78 @@
 final ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, null, null);
 final int itemId = cc.getId();
+final String tab = Values.getString(request.getParameter("tab"), "properties");
 final float scale = Base.getScale(sc);
 final DbControl dc = sc.newDbControl();
@@ -139 +141 @@
       Main.openPopup('index.jsp?ID=<%=ID%>&cmd='+cmd+'&item_id=<%=itemId%>', 'RunPlugin'+cmd, 740, 540);
     }
+    function switchTab(tabControlId, tabId)
+    {
+      if (TabControl.isActive(tabControlId, tabId)) return;
+      if (tabId == 'history' && tabId != '<%=tab%>')
+      {
+        location.href = 'index.jsp?ID=<%=ID%>&cmd=ViewItem&item_id=<%=itemId%>&tab='+tabId;
+      }
+      else
+      {
+        TabControl.setActiveTab(tabControlId, tabId);
+      }
+    }
     </script>
   </base:head>
@@ -148 +162 @@
     </p:path>
     
-    <t:tabcontrol id="main" active="properties">
+    <t:tabcontrol id="main" active="<%=tab%>" switch="switchTab" remember="false">
     <t:tab id="properties" title="Properties">
     
@@ -472 +486 @@
     </div>
       </t:tab>
+      <t:tab id="history" title="Change history" 
+        tooltip="Displays a log of all modifications made to this item"
+        visible="<%=ChangeHistoryUtil.showChangeHistoryTab(sc)%>">
+        <%
+        if ("history".equals(tab))
+        {
+          %>
+          <jsp:include page="../../common/history/frameset.jsp">
+            <jsp:param name="source_type" value="<%=itemType.name()%>" />
+            <jsp:param name="source_id" value="<%=itemId%>" />
+            <jsp:param name="ID" value="<%=ID%>" />
+          </jsp:include>
+          <%
+        }
+        %>
+      </t:tab>
       </t:tabcontrol>