Committing the following changes
1) Handling Null pointer Exceptions for EntityPubCount, EntityGrantCount and EntitySubOrganizationTypes 2) Removing the dependency on vis_mode parameter in the server side code. The class the individual belongs to is retrieved using vitroRequest.getWebappDaoFactory().getIndividualDao().getIndividualByURI(IndividualURI).isVClass(ClassURI) 3) On the client side, the vis_mode parameter is set(from the value passed on by the requesthandler) to differentiate between personURL and SubOrganizationTemporalGraphURL on drill down. 4) Added entityComparisonErrorActivator.ftl to handle edge cases (if the resultset of the queries is NULL)
This commit is contained in:
parent
2152bb6008
commit
9971e5fa2b
9 changed files with 121 additions and 113 deletions
|
@ -464,7 +464,7 @@ function getTemporalVisURL(entity) {
|
|||
|
||||
} else{
|
||||
|
||||
result = subOrganizationTemporalGraphURL+ "&vis_mode=" + entity.visMode + "&" +
|
||||
result = subOrganizationTemporalGraphURL + "&" +
|
||||
"uri=" + entity.entityURI ;
|
||||
}
|
||||
|
||||
|
@ -857,16 +857,16 @@ function setEntityLevel(){
|
|||
function getEntityVisMode(jsonData){
|
||||
|
||||
$.each(jsonData, function(index, val) {
|
||||
if (val.visMode == "SCHOOL" || val.visMode == "UNIVERSITY" || val.visMode == "DEPARTMENT"){
|
||||
entityLevel = "Organizations";
|
||||
} else {
|
||||
if (val.visMode == "PERSON"){
|
||||
entityLevel = "People";
|
||||
} else {
|
||||
entityLevel = "Organizations";
|
||||
}
|
||||
return;
|
||||
});
|
||||
|
||||
/* To provide graceful degradation set entity level to a default error message.*/
|
||||
entityElevel = "ENTITY LEVEL UNDEFINED ERROR";
|
||||
entitylevel = "ENTITY LEVEL UNDEFINED ERROR";
|
||||
}
|
||||
|
||||
function toCamelCase(string){
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue