From d9e34509e55890f62054a9c8a6f9937a82645a31 Mon Sep 17 00:00:00 2001
From: Alan Evans <aevans@kineto.com>
Date: Sat, 5 Jun 2010 21:52:30 +0100
Subject: [PATCH 4/4] BUG3816

---
 .../schema/src/main/liquibase/1.7.11/changelog.xml |   26 ++++++++++++++++++++
 .../src/main/java/org/opennms/web/asset/Asset.java |    4 +-
 opennms-webapp/src/main/webapp/element/node.jsp    |    4 +-
 3 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 core/schema/src/main/liquibase/1.7.11/changelog.xml

diff --git a/core/schema/src/main/liquibase/1.7.11/changelog.xml b/core/schema/src/main/liquibase/1.7.11/changelog.xml
new file mode 100644
index 0000000..8aa1be0
--- /dev/null
+++ b/core/schema/src/main/liquibase/1.7.11/changelog.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ 
+<databaseChangeLog
+	xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9
+		http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
+
+
+	<changeSet author="aevans" id="1.7.11-add-cli-and-gui">
+
+		<addColumn tableName="assets">
+                        <column name="cli" type="varchar(256)" />
+                </addColumn>
+		<addColumn tableName="assets">
+                        <column name="gui" type="varchar(256)" />
+                </addColumn>
+
+		<rollback>
+			<dropColumn tableName="assets" columnName="cli" />
+			<dropColumn tableName="assets" columnName="gui" />
+		</rollback>
+
+	</changeSet>
+	
+</databaseChangeLog>
diff --git a/opennms-webapp/src/main/java/org/opennms/web/asset/Asset.java b/opennms-webapp/src/main/java/org/opennms/web/asset/Asset.java
index fa8e8bd..e446d84 100644
--- a/opennms-webapp/src/main/java/org/opennms/web/asset/Asset.java
+++ b/opennms-webapp/src/main/java/org/opennms/web/asset/Asset.java
@@ -646,7 +646,7 @@ public class Asset extends Object {
     }
 
     public String getCli() {
-        return cli;
+            return cli;
     }
 
     public void setCli(String cli) {
@@ -658,7 +658,7 @@ public class Asset extends Object {
     }
 
     public String getGui() {
-        return gui;
+            return gui;
     }
 
     public void setGui(String gui) {
diff --git a/opennms-webapp/src/main/webapp/element/node.jsp b/opennms-webapp/src/main/webapp/element/node.jsp
index 4d48889..acf0cad 100644
--- a/opennms-webapp/src/main/webapp/element/node.jsp
+++ b/opennms-webapp/src/main/webapp/element/node.jsp
@@ -153,7 +153,7 @@
 
     public static Collection<Map<String, String>> createLinkForCli(int nodeId) throws SQLException, UnknownHostException {
 	String cli = NetworkElementFactory.getNodeCli(nodeId);
-        if (cli == null) {
+        if (cli == null || cli.equals("")) {
             Map<String, String> empty = new HashMap<String, String>(0);
             return Collections.singleton(empty);
         }
@@ -166,7 +166,7 @@
 
     public static Collection<Map<String, String>> createLinkForGui(int nodeId) throws SQLException, UnknownHostException {
 	String gui = NetworkElementFactory.getNodeGui(nodeId);
-        if (gui == null) {
+        if (gui == null || gui.equals("")) {
             Map<String, String> empty = new HashMap<String, String>(0);
             return Collections.singleton(empty);
         }
-- 
1.6.6.1