Changeset 5073 for trunk/www/views/jobs/view_job.jsp

Timestamp:

Aug 21, 2009, 12:15:11 PM (14 years ago)

Author:

Nicklas Nordborg

Message:

References #108: Logging the change history of an item

Added "Changed items" tab to the job popup that makes it possible to show all changes made by that job.

File:

• trunk/www/views/jobs/view_job.jsp (modified) (8 diffs)

trunk/www/views/jobs/view_job.jsp

@@ -39 +39 @@
   import="net.sf.basedb.core.Path"
   import="net.sf.basedb.core.User"
+  import="net.sf.basedb.core.ChangeHistory"
+  import="net.sf.basedb.core.ItemResultIterator"
   import="net.sf.basedb.core.ItemQuery"
   import="net.sf.basedb.core.ItemResultList"
@@ -45 +47 @@
   import="net.sf.basedb.core.PluginConfiguration"
   import="net.sf.basedb.core.ParameterInfo"
+  import="net.sf.basedb.core.query.Orders"
+  import="net.sf.basedb.core.query.Hql"
   import="net.sf.basedb.core.plugin.GuiContext"
   import="net.sf.basedb.core.plugin.Plugin"
@@ -51 +55 @@
   import="net.sf.basedb.plugins.util.Parameters"
   import="net.sf.basedb.clients.web.Base"
+  import="net.sf.basedb.clients.web.ChangeHistoryUtil"
   import="net.sf.basedb.clients.web.util.HTML"
   import="net.sf.basedb.util.Values"
@@ -68 +73 @@
   private static final Item itemType = Item.JOB;
   private static final GuiContext guiContext = new GuiContext(itemType, GuiContext.Type.ITEM);
+
+  private String getItemName(BasicItem item)
+  {
+    String itemName = "";
+    if (item instanceof File)
+    {
+      itemName = ((File)item).getPath().toString();
+    }
+    else if (item instanceof Nameable)
+    {
+      itemName = ((Nameable)item).getName();
+    }
+    else
+    {
+      itemName = item.toString();
+    }
+    return itemName;
+  }
 %>
 <%
@@ -153 +176 @@
   }
   %>
-
   <base:page type="popup" title="<%=title%>"> 
-  <base:head scripts="tabcontrol.js" styles="tabcontrol.css,progressbar.css">
+  <base:head scripts="tabcontrol.js,table.js" styles="tabcontrol.css,progressbar.css,table.css">
   <script language="JavaScript">
   function autoUpdate()
@@ -409 +431 @@
                 if (value instanceof BasicItem)
                 {
-                  BasicItem item = (BasicItem)value;
-                  String itemName = "";
-                  if (item instanceof File)
-                  {
-                    itemName = ((File)item).getPath().toString();
-                  }
-                  else if (item instanceof Nameable)
-                  {
-                    itemName = ((Nameable)item).getName();
-                  }
-                  else
-                  {
-                    itemName = item.toString();
-                  }
-                  sb.append(HTML.encodeTags(itemName));
+                  sb.append(HTML.encodeTags(getItemName((BasicItem)value)));
                 }
                 else if (value instanceof Date)
@@ -494 +502 @@
                   if (value instanceof BasicItem)
                   {
-                    BasicItem item = (BasicItem)value;
-                    String itemName = "";
-                    if (item instanceof File)
-                    {
-                      itemName = ((File)item).getPath().toString();
-                    }
-                    else if (item instanceof Nameable)
-                    {
-                      itemName = ((Nameable)item).getName();
-                    }
-                    else
-                    {
-                      itemName = item.toString();
-                    }
-                    sb.append(HTML.encodeTags(itemName));
+                    sb.append(HTML.encodeTags(getItemName((BasicItem)value)));
                   }
                   else if (value instanceof Date)
@@ -542 +536 @@
         
       </t:tab>
+      
+      <t:tab id="changes" title="Changed items"
+        tooltip="Display a log of all modifications made by this job"
+        visible="<%=!autoUpdate && ChangeHistoryUtil.showChangeHistoryTab(sc) %>">
+        <%
+        ItemQuery<ChangeHistory> query = ChangeHistory.getChangesBy(job);
+        query.order(Orders.asc(Hql.property("id")));
+        ItemResultIterator<ChangeHistory> changes = query.iterate(dc);
+        int numChanges = 0;
+        %>
+        <tbl:table id="history" clazz="itemlist" columns="all">
+          <tbl:columndef id="changeType" title="Change type" />
+          <tbl:columndef id="item" title="Item" />
+          <tbl:columndef id="info" title="Info" />
+          
+          <tbl:data>
+            <tbl:columns>
+            </tbl:columns>
+            <tbl:rows>
+            <%
+            while (changes.hasNext())
+            {
+              numChanges++;
+              ChangeHistory change = changes.next();
+              %>
+              <tbl:row>
+                <tbl:cell column="changeType"><%=change.getChangeType()%> <%=change.getItemType()%></tbl:cell>
+                <tbl:cell column="item"><%=ChangeHistoryUtil.getItem(dc, change, false, false)%></tbl:cell>
+                <tbl:cell column="info"><%=HTML.encodeTags(change.getChangeInfo())%></tbl:cell>
+              </tbl:row>
+              <%
+            }
+            %>
+            </tbl:rows>
+          </tbl:data>
+          <%
+          if (numChanges == 0)
+          {
+            %>
+            <tbl:panel>
+            No log entries found for this job. NOTE! This job may have made 
+            other changes that are not recorded by the logging mechanism.
+            </tbl:panel>
+            <%
+          }
+          %>
+        </tbl:table>
+        
+      </t:tab>
+      
       </t:tabcontrol>