merging in changes from NIHVIVO-1191 and NIHVIVO-1195 from the 1.1.1 branch

This commit is contained in:
sjm222 2010-10-05 21:35:33 +00:00
parent b02bfa8191
commit 9e1a84e174
2 changed files with 134 additions and 47 deletions

View file

@ -60,7 +60,7 @@ public class VClass extends BaseResourceBean implements Comparable<VClass>
public void setQuickEditJsp(String quickEditJsp) { this.quickEditJsp = quickEditJsp; }
protected Integer displayRank = null;
public int getDisplayRank() { return (displayLimit == null ? -1 : displayLimit); }
public int getDisplayRank() { return (displayRank == null ? -1 : displayRank); }
public void setDisplayRank(int displayRank) { this.displayRank = displayRank; }
protected String groupURI = null;