Changeset 3580

Timestamp:

Jul 20, 2007, 8:02:00 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #690: Not allowed to read Extra value type

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/DynamicUtil.java (modified) (1 diff)
• www/views/experiments/bioassaysets/analysis_tree.jsp (modified) (1 diff)
• www/views/experiments/extravalues/view_extravalue.jsp (modified) (6 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/DynamicUtil.java

@@ -169 +169 @@
     {
       ExtraValue ev = result.next();
-      ExtraValueType evt = ev.getExtraValueType();
       int id = ev.getId();
-      TableColumn tc = new TableColumn(idPrefix+id, propertyPrefix + id, "xtra('" + evt.getExternalId() + "')", ev.getValueType(), 
-        titlePrefix+evt.getName(), evt.getDescription(), "auto", true, true, true, evt.getAverageMethod(), null);
-      Formatter<?> formatter = FormatterFactory.getTypeFormatter(sc, evt.getValueType());
-      if (evt.getValueType().isNumerical())
+      ExtraValueType evt = null;
+      TableColumn tc = null;
+      try
+      {
+        evt = ev.getExtraValueType();
+        tc = new TableColumn(idPrefix+id, propertyPrefix + id, "xtra('" + evt.getExternalId() + "')", 
+            ev.getValueType(), titlePrefix+evt.getName(), evt.getDescription(), 
+            "auto", true, true, true, evt.getAverageMethod(), null);
+      }
+      catch (Throwable t)
+      {
+        tc = new TableColumn(idPrefix+id, propertyPrefix + id, "xtra('" + id + "')", 
+            ev.getValueType(), titlePrefix+ev.getValueType(), "", 
+            "auto", true, true, true, null, null);
+      }
+      Formatter<?> formatter = FormatterFactory.getTypeFormatter(sc, ev.getValueType());
+      if (ev.getValueType().isNumerical() && evt != null)
       {
         // Numerical types *should* return a numeric formatter which is required by the color formatter

trunk/www/views/experiments/bioassaysets/analysis_tree.jsp

@@ -768 +768 @@
                   ccc = xvc;
                   onClick = "extraValueOnClick";
-                  ExtraValueType xvType = xv.getExtraValueType();
-                  name = HTML.encodeTags(xvType.getName());
-                  description = HTML.encodeTags(xvType.getDescription());
+                  try
+                  {
+                    ExtraValueType xvType = xv.getExtraValueType();
+                    name = HTML.encodeTags(xvType.getName());
+                    description = HTML.encodeTags(xvType.getDescription());
+                  }
+                  catch (PermissionDeniedException ex)
+                  {
+                    name = xv.getValueType().toString();
+                    description = "";
+                  }
                   try
                   {

trunk/www/views/experiments/extravalues/view_extravalue.jsp

@@ -88 +88 @@
   String title = null;
   final ExtraValue extraValue = ExtraValue.getById(dc, itemId);
-  final ExtraValueType extraValueType = extraValue.getExtraValueType();
   final BioAssaySet bioAssaySet = extraValue.getBioAssaySet();
   final Experiment experiment = bioAssaySet.getExperiment();
@@ -94 +93 @@
   RawDataType rawDataType = experiment.getRawDataType();
   
+  ExtraValueType extraValueType = null;
+  boolean readExtraValueType = true;
   Job job = null;
   boolean readJob = true;
@@ -101 +102 @@
   boolean readConfiguration = true;
 
+  try
+  {
+    extraValueType = extraValue.getExtraValueType();
+  }
+  catch (PermissionDeniedException ex)
+  {
+    readExtraValueType = false;
+  }
   try
   {
@@ -167 +176 @@
       <p:pathelement title="<%=HTML.encodeTags(bioAssaySet.getName())%>" 
         href="<%="../bioassaysets/index.jsp?ID="+ID+"&cmd=ViewItem&experiement_id="+experimentId+"&item_id="+bioAssaySet.getId()%>" />
-      <p:pathelement title="<%=HTML.encodeTags(extraValueType.getName()) %>" />
+      <p:pathelement title="<%=HTML.encodeTags(extraValueType == null ? extraValue.getValueType().toString() : extraValueType.getName()) %>" />
     </p:path>
     
@@ -227 +236 @@
         <h4>Extra value</h4>
         <table class="form" cellspacing=0>
-        <tr>
-          <td class="prompt">Name</td>
-          <td><%=Base.getLinkedName(ID, extraValueType, false, writePermission)%></td>
-        </tr>
+        <%
+        if (extraValueType == null)
+        {
+          %>
+          <tr>
+            <td class="prompt">Type</td>
+            <td><%=extraValue.getValueType()%></td>
+          </tr>
+          <%
+        }
+        else
+        {
+          %>
+          <tr>
+            <td class="prompt">Name</td>
+            <td><%=Base.getLinkedName(ID, extraValueType, !readExtraValueType, writePermission)%></td>
+          </tr>
+          <%
+        }
+        %>
         <tr>
           <td class="prompt">Bioassay set</td>
@@ -246 +271 @@
         <tr>
           <td class="prompt">Description</td>
-          <td><%=HTML.niceFormat(extraValueType.getDescription())%></td>
+          <td><%=HTML.niceFormat(extraValueType != null ? extraValueType.getDescription() : "")%></td>
         </tr>
         </table>