From 1459228d5a6ca828b9d35550de90d4e62afa6fb4 Mon Sep 17 00:00:00 2001
From: hjkhjk54 <hjkhjk54@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 15 Jul 2011 20:35:14 +0000
Subject: [PATCH] updates to validation for menu management and update for
 checking default namespace and not throwing error if /individual not found

---
 .../edit/utils/LocalNamespaceClassUtils.java  | 33 ++++++++++++-------
 webapp/web/js/menupage/menumanagement_edit.js |  2 ++
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/LocalNamespaceClassUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/LocalNamespaceClassUtils.java
index 704e0b3bd..caa03da8a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/LocalNamespaceClassUtils.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/LocalNamespaceClassUtils.java
@@ -56,16 +56,19 @@ public class LocalNamespaceClassUtils {
         
     	//Get all namespacs
     	//There's an APP for that!
-    	 OntologyDao dao = vreq.getFullWebappDaoFactory().getOntologyDao();
-         List<Ontology> onts = dao.getAllOntologies();
-         for(Ontology on: onts) {
-        	String uri = on.getURI();
-        	if(uri.startsWith(defaultNamespacePattern)) {
-        		String name =  on.getName();
-        		String prefix = on.getPrefix();
-        		foundNamespaces.put(uri, name + " (" + prefix + ")");
-        	}
-         }
+        //defualt namespace pattern is null if the default namespace does not employ /individual
+        if(defaultNamespacePattern != null) {
+	    	 OntologyDao dao = vreq.getFullWebappDaoFactory().getOntologyDao();
+	         List<Ontology> onts = dao.getAllOntologies();
+	         for(Ontology on: onts) {
+	        	String uri = on.getURI();
+	        	if(uri.startsWith(defaultNamespacePattern)) {
+	        		String name =  on.getName();
+	        		String prefix = on.getPrefix();
+	        		foundNamespaces.put(uri, name + " (" + prefix + ")");
+	        	}
+	         }
+        }
     	
         return foundNamespaces;
     }
@@ -73,7 +76,13 @@ public class LocalNamespaceClassUtils {
     public static String getDefaultOntologyNamespace(VitroRequest vreq) {
     	String defaultNamespace= vreq.getWebappDaoFactory().getDefaultNamespace();
     	//Assuming following linked data approach so expects /individual at end
-    	defaultNamespace = defaultNamespace.substring(0, defaultNamespace.lastIndexOf("/individual")) + "/ontology/";
-    	return defaultNamespace;
+    	int lastIndex = defaultNamespace.lastIndexOf("/individual");
+    	//if namespace is correct
+    	if(lastIndex != -1) {
+    		defaultNamespace = defaultNamespace.substring(0, lastIndex) + "/ontology/";
+    		return defaultNamespace;
+    	} else {
+    		return null;
+    	}
     }
 }
diff --git a/webapp/web/js/menupage/menumanagement_edit.js b/webapp/web/js/menupage/menumanagement_edit.js
index a80957a4a..023edca0d 100644
--- a/webapp/web/js/menupage/menumanagement_edit.js
+++ b/webapp/web/js/menupage/menumanagement_edit.js
@@ -47,6 +47,7 @@ var menuManagementEdit = {
             if (validationError == "") {
                    $(this).submit();
                } else{
+            	   alert(validationError);
                    $('#error-alert').removeClass('hidden');
                    $('#error-alert p').html(validationError);
                    return false;
@@ -82,6 +83,7 @@ var menuManagementEdit = {
         }*/
         // Check/unckeck all classes for selection
         $('input:checkbox[name=allSelected]').click(function(){
+             // alert($('input:checkbox[name=classInClassGroup]'));
              if ( this.checked ) {
              // if checked, select all the checkboxes
              $('input:checkbox[name=classInClassGroup]').attr('checked','checked');