litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-if all grants or pubs are hidden, the manage link should still be displayed

Browse source
This commit is contained in:
tworrall 2012-06-27 19:16:24 +00:00
parent a59d3c872d
commit c3d67a7872
3 changed files with 21 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
productMods/js/individual/individualUtils.js
View file

@ -98,15 +98,5 @@ $(document).ready(function(){
return false; return false;
}); });
// if there are no selected pub, hide the manage link; same for grants
if ( $('ul#authorInAuthorshipList').children('li').length < 1 ) {
$('a#managePropLink').hide();
}
if ( $('ul#hasResearcherRoleList').children('li').length < 1 &&
$('ul#hasPrincipalInvestigatorRoleList').children('li').length < 1 &&
$('ul#hasCo-PrincipalInvestigatorRoleList').children('li').length < 1 &&
$('ul#hasInvestigatorRoleList').children('li').length < 1 ) {
$('a#manageGrantLink').hide();
}
}); });

10
src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java
View file

@ -101,16 +101,18 @@ public class ManageGrantsForIndividualController extends FreemarkerHttpServlet {
ResultSet results = QueryUtils.getQueryResults(queryStr, vreq); ResultSet results = QueryUtils.getQueryResults(queryStr, vreq);
while (results.hasNext()) { while (results.hasNext()) {
QuerySolution soln = results.nextSolution(); QuerySolution soln = results.nextSolution();
String subclassUri = soln.get("subclass").toString(); RDFNode subclassUri= soln.get("subclass");
VClass vClass = (VClass) vcDao.getVClassByURI(subclassUri); if ( subclassUri != null ) {
String subclass = ((vClass.getName() == null) ? subclassUri : vClass.getName()); String subclassUriStr = soln.get("subclass").toString();
VClass vClass = (VClass) vcDao.getVClassByURI(subclassUriStr);
String subclass = ((vClass.getName() == null) ? subclassUriStr : vClass.getName());
if(!subclassToGrants.containsKey(subclass)) { if(!subclassToGrants.containsKey(subclass)) {
subclassToGrants.put(subclass, new ArrayList<Map<String,String>>()); //list of grant information subclassToGrants.put(subclass, new ArrayList<Map<String,String>>()); //list of grant information
} }
String label = soln.get("label").toString();
List<Map<String,String>> grantsList = subclassToGrants.get(subclass); List<Map<String,String>> grantsList = subclassToGrants.get(subclass);
grantsList.add(QueryUtils.querySolutionToStringValueMap(soln)); grantsList.add(QueryUtils.querySolutionToStringValueMap(soln));
} }
}
} catch (Exception e) { } catch (Exception e) {
log.error(e, e); log.error(e, e);
} }

10
src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java
View file

@ -98,16 +98,18 @@ public class ManagePublicationsForIndividualController extends FreemarkerHttpSer
ResultSet results = QueryUtils.getQueryResults(queryStr, vreq); ResultSet results = QueryUtils.getQueryResults(queryStr, vreq);
while (results.hasNext()) { while (results.hasNext()) {
QuerySolution soln = results.nextSolution(); QuerySolution soln = results.nextSolution();
String subclassUri = soln.get("subclass").toString(); RDFNode subclassUri= soln.get("subclass");
VClass vClass = (VClass) vcDao.getVClassByURI(subclassUri); if ( subclassUri != null ) {
String subclass = ((vClass.getName() == null) ? subclassUri : vClass.getName()); String subclassUriStr = soln.get("subclass").toString();
VClass vClass = (VClass) vcDao.getVClassByURI(subclassUriStr);
String subclass = ((vClass.getName() == null) ? subclassUriStr : vClass.getName());
if(!subclassToPublications.containsKey(subclass)) { if(!subclassToPublications.containsKey(subclass)) {
subclassToPublications.put(subclass, new ArrayList<Map<String,String>>()); //list of publication information subclassToPublications.put(subclass, new ArrayList<Map<String,String>>()); //list of publication information
} }
List<Map<String,String>> publicationsList = subclassToPublications.get(subclass); List<Map<String,String>> publicationsList = subclassToPublications.get(subclass);
publicationsList.add(QueryUtils.querySolutionToStringValueMap(soln)); publicationsList.add(QueryUtils.querySolutionToStringValueMap(soln));
} }
}
} catch (Exception e) { } catch (Exception e) {
log.error(e, e); log.error(e, e);
} }