This one's better.
Dominik
--- opennms/opennms-webapp/src/main/webapp/asset/modify.jsp 2011-04-04 16:09:47.629579969 +0200
+++ opennms.patched/opennms-webapp/src/main/webapp/asset/modify.jsp 2011-04-04 16:09:30.196633883 +0200
@@ -46,7 +46,6 @@
import="org.opennms.web.WebSecurityUtils,
org.opennms.web.asset.*,
org.opennms.web.element.*,
- org.opennms.netmgt.model.OnmsNode,
org.opennms.web.springframework.security.Authentication,
org.opennms.web.MissingParameterException
"
@@ -72,7 +71,7 @@
int nodeId = WebSecurityUtils.safeParseInt( nodeIdString );
String nodeLabel = NetworkElementFactory.getInstance(getServletContext()).getNodeLabel( nodeId );
Asset asset = this.model.getAsset( nodeId );
- OnmsNode node_db = NetworkElementFactory.getInstance(getServletContext()).getNode( nodeId );
+ Node node_db = NetworkElementFactory.getInstance(getServletContext()).getNode( nodeId );
boolean isNew = false;
if( asset == null ) {
@@ -97,25 +96,25 @@
</p>
<%-- Handle the SNMP information if any --%>
-<% if( node_db.getSysObjectId() != null ) { %>
+<% if( node_db.getNodeSysId() != null ) { %>
<table class="standard">
<tr>
<td class="standardheader"> System Id </td>
- <td class="standard"> <%=node_db.getSysObjectId()%> </td>
+ <td class="standard"> <%=node_db.getNodeSysId()%> </td>
<td class="standardheader"> System Name </td>
- <td class="standard"> <%=node_db.getSysName()%> </td>
+ <td class="standard"> <%=node_db.getNodeSysName()%> </td>
</tr>
<tr>
<td class="standardheader"> System Location </td>
- <td class="standard"> <%=node_db.getSysLocation()%> </td>
+ <td class="standard"> <%=node_db.getNodeSysLocn()%> </td>
<td class="standardheader"> System Contact </td>
- <td class="standard"> <%=node_db.getSysContact()%> </td>
+ <td class="standard"> <%=node_db.getNodeSysContact()%> </td>
</tr>
<tr>
<td class="standardheader"> System Description </td>
- <td class="standard"> <%=node_db.getSysDescription()%> </td>
+ <td class="standard"> <%=node_db.getNodeSysDescr()%> </td>
<td class="standard" colspan="2"> </td>
</tr>
</table>
@@ -194,7 +193,9 @@
</tr>
<tr>
<td>Address 1</td>
- <td colspan="5"><%=getTextField(request, "text", "address1", asset.getAddress1(), "100", "256")%></td>
+ <td colspan="3"><%=getTextField(request, "text", "address1", asset.getAddress1(), "100", "256")%></td>
+ <td>Admin</td>
+ <td><%=getTextField(request, "text", "admin", asset.getAdmin(), "20", "64")%></td>
</tr>
<tr>
<td>Address 2</td>
@@ -297,10 +298,50 @@
</select>
<% }else{ getTextField(request, "text", "autoEnable", asset.getAutoenable(), "20", "64"); } %>
</td>
- <td> </td>
- <td> </td>
- </tr>
+ <% if(isAuthorizedUser){ %>
+ <td>SNMP community</td>
+ <td><%=getTextField( request, "text", "snmpcommunity", asset.getSnmpcommunity(), "20", "32")%></td>
+ <% } else { %>
+ <td> </td>
+ <td> </td>
+ <% } %>
+ </tr>
+ <tr>
+ <td colspan="6"><h3>Hardware</h3></td>
+ </tr>
+ <tr>
+ <td>Cpu</td>
+ <td><%=getTextField( request, "text", "cpu", asset.getCpu(), "20", "32")%></td>
+ <td>Ram</td>
+ <td><%=getTextField( request, "text", "ram", asset.getRam(), "10", "10")%></td>
+ <td>Storage Controller</td>
+ <td><%=getTextField( request, "text", "storagectrl", asset.getStoragectrl(), "20", "32")%></td>
+ </tr>
+ <tr>
+ <td>HDD 1</td>
+ <td><%=getTextField( request, "text", "hdd1", asset.getHdd1(), "20", "32")%></td>
+ <td>HDD 4</td>
+ <td><%=getTextField( request, "text", "hdd4", asset.getHdd4(), "20", "32")%></td>
+ <td>Additional hardware</td>
+ <td><%=getTextField( request, "text", "additionalhardware", asset.getAdditionalhardware(), "20", "64")%></td>
+ </tr>
+ <tr>
+ <td>HDD 2</td>
+ <td><%=getTextField( request, "text", "hdd2", asset.getHdd2(), "20", "32")%></td>
+ <td>HDD 5</td>
+ <td><%=getTextField( request, "text", "hdd5", asset.getHdd5(), "20", "32")%></td>
+ <td>Number of power supplies</td>
+ <td><%=getTextField( request, "text", "numpowersupplies", asset.getNumpowersupplies(), "1", "1")%></td>
+ </tr>
<tr>
+ <td>HDD 3</td>
+ <td><%=getTextField( request, "text", "hdd3", asset.getHdd3(), "20", "32")%></td>
+ <td>HDD 6</td>
+ <td><%=getTextField( request, "text", "hdd6", asset.getHdd6(), "20", "32")%></td>
+ <td>Inputpower</td>
+ <td><%=getTextField( request, "text", "inputpower", asset.getInputpower(), "6", "6")%></td>
+ </tr>
+ <tr>
<td colspan="6"><h3>Comments</h3></td>
</tr>
<tr>
------------------------------------------------------------------------------
Create and publish websites with WebMatrix
Use the most popular FREE web apps or write code yourself;
WebMatrix provides all the features you need to develop and
publish your website. http://p.sf.net/sfu/ms-webmatrix-sf
_______________________________________________
Please read the OpenNMS Mailing List FAQ:
http://www.opennms.org/index.php/Mailing_List_FAQ
opennms-devel mailing list
To *unsubscribe* or change your subscription options, see the bottom of this
page:
https://lists.sourceforge.net/lists/listinfo/opennms-devel
