From 9ac7796c6729df015432deed567007ac7efef91a Mon Sep 17 00:00:00 2001 From: rjy7 Date: Fri, 14 Jan 2011 22:22:44 +0000 Subject: [PATCH 1/6] NIHVIVO-1667 Don't display an add link for data properties whose display limit has already been reached. --- .../individual/DataPropertyTemplateModel.java | 21 +++++++++++-------- .../individual/GroupedPropertyList.java | 5 +++-- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java index 629c14f48..71277ac36 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java @@ -33,15 +33,7 @@ public class DataPropertyTemplateModel extends PropertyTemplateModel { super(dp, subject, policyHelper); setName(dp.getPublicName()); - - // Determine whether a new statement can be added - if (policyHelper != null) { - RequestedAction action = new AddDataPropStmt(subjectUri, propertyUri,RequestActionConstants.SOME_LITERAL, null, null); - if (policyHelper.isAuthorizedAction(action)) { - addAccess = true; - } - } - + // Get the data property statements via a sparql query DataPropertyStatementDao dpDao = vreq.getWebappDaoFactory().getDataPropertyStatementDao(); List values = dpDao.getDataPropertyValuesForIndividualByProperty(subject, dp); @@ -49,6 +41,17 @@ public class DataPropertyTemplateModel extends PropertyTemplateModel { for (Literal value : values) { statements.add(new DataPropertyStatementTemplateModel(subjectUri, propertyUri, value, policyHelper)); } + + // Determine whether a new statement can be added + if (policyHelper != null) { + // If the display limit has already been reached, we can't add a new statement + if ( dp.getDisplayLimit() > statements.size() ) { + RequestedAction action = new AddDataPropStmt(subjectUri, propertyUri,RequestActionConstants.SOME_LITERAL, null, null); + if (policyHelper.isAuthorizedAction(action)) { + addAccess = true; + } + } + } } /* Access methods for templates */ diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java index 626a6e2be..27148b10c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java @@ -99,8 +99,8 @@ public class GroupedPropertyList extends BaseTemplateModel { // Build the template data model from the groupList groups = new ArrayList(propertyGroupList.size()); - for (PropertyGroup pg : propertyGroupList) { - groups.add(new PropertyGroupTemplateModel(vreq, pg, subject, policyHelper)); + for (PropertyGroup propertyGroup: propertyGroupList) { + groups.add(new PropertyGroupTemplateModel(vreq, propertyGroup, subject, policyHelper)); } } @@ -425,5 +425,6 @@ public class GroupedPropertyList extends BaseTemplateModel { } return null; } + } From 8e1f314157475de84e4521a92bb7b94e281b1c4f Mon Sep 17 00:00:00 2001 From: mb863 Date: Fri, 14 Jan 2011 22:33:57 +0000 Subject: [PATCH 2/6] NIHVIVO-1723: Fixed alignment of letter OR in external authentication --- webapp/web/css/login.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/web/css/login.css b/webapp/web/css/login.css index e3ab3d82a..d152f3270 100644 --- a/webapp/web/css/login.css +++ b/webapp/web/css/login.css @@ -50,8 +50,8 @@ p.request-account { height: 30px; background: #fff 0 0 url(../images/login-or.png) no-repeat; margin-bottom: 0; - padding-left: 10px; - padding-top: 6px; + padding-left: 9px; + padding-top: 3px; color: #fff; font-size: .8em; } From b4b3c1300b52efeb26ccc7335eab971be8ef2761 Mon Sep 17 00:00:00 2001 From: mb863 Date: Fri, 14 Jan 2011 22:36:11 +0000 Subject: [PATCH 3/6] NIHVIVO-1719; Fixed formatting for radio buttons --- webapp/web/css/edit.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/webapp/web/css/edit.css b/webapp/web/css/edit.css index eda198061..afc94d24f 100644 --- a/webapp/web/css/edit.css +++ b/webapp/web/css/edit.css @@ -326,6 +326,10 @@ span.entityRelationsSpan { color: #2E440C; text-align: center; } +div.sparqlform label { + display: inline; + font-weight: normal; +} /* Temporary hack to remove stuff from forms in vivoweb only */ .hideFromVivoWeb { display: none; From 57ff8a0ca0e4d08acea73d6f9174c71df1b602eb Mon Sep 17 00:00:00 2001 From: mb863 Date: Fri, 14 Jan 2011 22:37:26 +0000 Subject: [PATCH 4/6] NIHVIVO-641: Removed arrow from headers and fixed individual list display. --- webapp/web/css/menupage/menupage.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webapp/web/css/menupage/menupage.css b/webapp/web/css/menupage/menupage.css index a0fe2f6e1..08922967a 100644 --- a/webapp/web/css/menupage/menupage.css +++ b/webapp/web/css/menupage/menupage.css @@ -279,6 +279,8 @@ ul#alpha-browse-childClass a{ padding-top: 20px; margin-left: 30px; margin-right: 30px; + clear: left; + min-height: 100px; } #individuals-in-childClass li.individual-foaf-person img{ float: left; From c06645ce88fffc8253fff1d9a8eaa730e3631d7f Mon Sep 17 00:00:00 2001 From: rjy7 Date: Fri, 14 Jan 2011 23:11:50 +0000 Subject: [PATCH 5/6] Modify messages displayed when a collated property doesn't have a valid config for collation, and downgrade from an error to a warning --- .../individual/CollatedObjectPropertyTemplateModel.java | 4 ++-- .../individual/ObjectPropertyTemplateModel.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java index 03b4cdd9a..60fbd3e60 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java @@ -45,8 +45,8 @@ public class CollatedObjectPropertyTemplateModel extends ObjectPropertyTemplateM String invalidConfigMessage = checkConfiguration(); if ( ! invalidConfigMessage.isEmpty() ) { - throw new InvalidConfigurationException("Invalid configuration for property " + - op.getURI() + ":" + invalidConfigMessage); + throw new InvalidConfigurationException("Invalid configuration for collated property " + + op.getURI() + ":" + invalidConfigMessage + ". Creating uncollated display instead."); } /* Get the data */ diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java index aef940eee..750e93d11 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java @@ -141,7 +141,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel try { return new CollatedObjectPropertyTemplateModel(op, subject, vreq, policyHelper); } catch (InvalidConfigurationException e) { - log.error(e); + log.warn(e); return new UncollatedObjectPropertyTemplateModel(op, subject, vreq, policyHelper); } } else { From d3e54a584111720ae679bb179b39ea971ef13b3a Mon Sep 17 00:00:00 2001 From: bjl23 Date: Sat, 15 Jan 2011 00:24:15 +0000 Subject: [PATCH 6/6] simpler solution to NIHVIVO-1708 --- .../mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java index ee77d69aa..348dd1235 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java @@ -20,8 +20,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao; import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; public class WebappDaoFactorySDB extends WebappDaoFactoryJena { - - private DatasetWrapperFactory dwf; /** * For use when any database connection associated with the Dataset @@ -32,7 +30,6 @@ public class WebappDaoFactorySDB extends WebappDaoFactoryJena { public WebappDaoFactorySDB(OntModelSelector ontModelSelector, Dataset dataset) { super(ontModelSelector); this.dwf = new StaticDatasetFactory(dataset); - super.dwf = new StaticDatasetFactory(dataset); } /** @@ -48,7 +45,6 @@ public class WebappDaoFactorySDB extends WebappDaoFactoryJena { String[] preferredLanguages) { super(ontModelSelector, defaultNamespace, nonuserNamespaces, preferredLanguages); this.dwf = new StaticDatasetFactory(dataset); - super.dwf = new StaticDatasetFactory(dataset); } /** @@ -65,7 +61,6 @@ public class WebappDaoFactorySDB extends WebappDaoFactoryJena { String[] preferredLanguages) { super(ontModelSelector, defaultNamespace, nonuserNamespaces, preferredLanguages); this.dwf = new ReconnectingDatasetFactory(bds, storeDesc); - super.dwf = new ReconnectingDatasetFactory(bds, storeDesc); } @Override