Changeset 3798

Timestamp:

Sep 28, 2007, 8:45:09 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

References #721: Changed systemId to externalId in JSP as well

Location:

branches/filedb/www/admin

Files:

• datafiletypes/edit_filetype.jsp (modified) (2 diffs)
• datafiletypes/index.jsp (modified) (1 diff)
• datafiletypes/list_filetypes.jsp (modified) (2 diffs)
• datafiletypes/view_filetype.jsp (modified) (3 diffs)
• platforms/edit_platform.jsp (modified) (2 diffs)
• platforms/index.jsp (modified) (2 diffs)
• platforms/list_platforms.jsp (modified) (2 diffs)
• platforms/view_platform.jsp (modified) (1 diff)

branches/filedb/www/admin/datafiletypes/edit_filetype.jsp

@@ -112 +112 @@
         return false;
       }
-      else if (frm.SystemId && Main.trimString(frm.systemId.value) == '')
-      {
-        alert("You must enter a system ID");
-        frm.systemId.focus();
+      else if (frm.externalId && Main.trimString(frm.externalId.value) == '')
+      {
+        alert("You must enter an external ID");
+        frm.externalId.focus();
         return false;
       }
@@ -171 +171 @@
         <tr>
           <td class="prompt">System ID</td>
-          <td><input <%=unchangeableClazz%> type="text" name="systemId" 
-            value="<%=HTML.encodeTags(cc.getPropertyValue("systemId"))%>" 
-            size="40" maxlength="<%=DataFileType.MAX_SYSTEM_ID_LENGTH%>"></td>
+          <td><input <%=unchangeableClazz%> type="text" name="externalId" 
+            value="<%=HTML.encodeTags(cc.getPropertyValue("externalId"))%>" 
+            size="40" maxlength="<%=DataFileType.MAX_EXTERNAL_ID_LENGTH%>"></td>
         </tr>
         <tr>

branches/filedb/www/admin/datafiletypes/index.jsp

@@ -131 +131 @@
     if (fileType == null)
     {
-      String systemId = Values.getStringOrNull(request.getParameter("systemId"));
+      String externalId = Values.getStringOrNull(request.getParameter("externalId"));
       Item itemType = Item.valueOf(request.getParameter("itemType"));
-      fileType = DataFileType.getNew(dc, systemId, itemType);
+      fileType = DataFileType.getNew(dc, externalId, itemType);
       message = "Data file type created";
       dc.saveItem(fileType);

branches/filedb/www/admin/datafiletypes/list_filetypes.jsp

@@ -225 +225 @@
       />
       <tbl:columndef 
-        id="systemId"
-        property="systemId"
+        id="externalId"
+        property="externalId"
         datatype="string"
-        title="System ID"
+        title="External ID"
         sortable="true"
         filterable="true"
@@ -436 +436 @@
                   onclick="itemOnClick(<%=writePermission ? "event" : null%>, <%=itemId%>)"
                   title="<%=tooltip%>"><%=name%></div></tbl:cell>
-                <tbl:cell column="systemId"><%=Values.getString(item.getSystemId())%></tbl:cell>
+                <tbl:cell column="externalId"><%=Values.getString(item.getExternalId())%></tbl:cell>
                 <tbl:cell column="extension"><%=Values.getString(item.getExtension())%></tbl:cell>
                 <tbl:cell column="itemType"><%=item.getItemType()%></tbl:cell>

branches/filedb/www/admin/datafiletypes/view_filetype.jsp

@@ -185 +185 @@
       </tr>
       <tr>
-        <td class="prompt">System ID</td>
-        <td><%=HTML.encodeTags(fileType.getSystemId())%></td>
+        <td class="prompt">External ID</td>
+        <td><%=HTML.encodeTags(fileType.getExternalId())%></td>
       </tr>
       <tr>
@@ -207 +207 @@
         <td class="prompt">Meta data reader</td>
         <td><%=HTML.encodeTags(fileType.getMetadataReaderClass())%></td>
-      </tr>
-      <tr>
-        <td class="prompt">System ID</td>
-        <td><%=HTML.encodeTags(fileType.getSystemId())%></td>
       </tr>
       <tr valign="baseline">
@@ -237 +233 @@
       {
         %>
-        <h4 class="docked">Platforms</h4>
+        <h4 class="docked">Used on platforms</h4>
         <tbl:table
           id="platforms"

branches/filedb/www/admin/platforms/edit_platform.jsp

@@ -93 +93 @@
         return false;
       }
-      else if (Main.trimString(frm.systemId.value) == '')
-      {
-        alert("You must enter a system ID");
-        frm.systemId.focus();
+      else if (Main.trimString(frm.externalId.value) == '')
+      {
+        alert("You must enter an external ID");
+        frm.externalId.focus();
         return false;
       }
@@ -181 +181 @@
         %>
         <tr>
-          <td class="prompt">System ID</td>
-          <td><input <%=requiredClazz%> type="text" name="systemId" 
-            value="<%=HTML.encodeTags(cc.getPropertyValue("systemId"))%>" 
-            size="40" maxlength="<%=Platform.MAX_SYSTEM_ID_LENGTH%>"></td>
+          <td class="prompt">External ID</td>
+          <td><input <%=requiredClazz%> type="text" name="externalId" 
+            value="<%=HTML.encodeTags(cc.getPropertyValue("externalId"))%>" 
+            size="40" maxlength="<%=Platform.MAX_EXTERNAL_ID_LENGTH%>"></td>
         </tr>
         <tr>

branches/filedb/www/admin/platforms/index.jsp

@@ -55 +55 @@
 <%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
 <%!
-  private static final ItemContext defaultContext = Base.createDefaultContext("name", "name,fileOnly,systemId,description");
+  private static final ItemContext defaultContext = Base.createDefaultContext("name", "name,fileOnly,externalId,description");
   private static final Item itemType = Item.PLATFORM;
 %>
@@ -132 +132 @@
     {
       boolean fileOnly = Values.getBoolean(request.getParameter("fileOnly"));
-      String systemId = Values.getStringOrNull(request.getParameter("systemId"));
+      String externalId = Values.getStringOrNull(request.getParameter("externalId"));
       if (fileOnly)
       {
-        platform = Platform.getNew(dc, systemId, Values.getInt(request.getParameter("channels")));
+        platform = Platform.getNew(dc, externalId, Values.getInt(request.getParameter("channels")));
       }
       else
       {
         RawDataType rdt = RawDataTypes.getRawDataType(request.getParameter("rawdatatype"));
-        platform = Platform.getNew(dc, systemId, rdt);
+        platform = Platform.getNew(dc, externalId, rdt);
       }
       message = "Platform created";

branches/filedb/www/admin/platforms/list_platforms.jsp

@@ -208 +208 @@
       />
       <tbl:columndef 
-        id="systemId"
-        property="systemId"
+        id="externalId"
+        property="externalId"
         datatype="string"
-        title="System ID"
+        title="External ID"
         sortable="true"
         filterable="true"
@@ -398 +398 @@
                   onclick="itemOnClick(<%=writePermission ? "event" : null%>, <%=itemId%>)"
                   title="<%=tooltip%>"><%=name%></div></tbl:cell>
-                <tbl:cell column="systemId"><%=Values.getString(item.getSystemId())%></tbl:cell>
+                <tbl:cell column="externalId"><%=item.getExternalId()%></tbl:cell>
                 <tbl:cell column="fileOnly"><%=item.isFileOnly() ? "yes" : "no"%></tbl:cell>
                 <tbl:cell column="channels"><%=rdt == null ? "N/A" : rdt.getChannels()%></tbl:cell>

branches/filedb/www/admin/platforms/view_platform.jsp

@@ -192 +192 @@
       </tr>
       <tr>
-        <td class="prompt">System ID</td>
-        <td><%=HTML.encodeTags(platform.getSystemId())%></td>
+        <td class="prompt">External ID</td>
+        <td><%=HTML.encodeTags(platform.getExternalId())%></td>
       </tr>
       <tr>