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

Modify messages displayed when a collated property doesn't have a valid config for collation, and downgrade from an error to a warning

Browse source
This commit is contained in:
rjy7 2011-01-14 23:11:50 +00:00
parent 57ff8a0ca0
commit c06645ce88
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
View file

@ -45,8 +45,8 @@ public class CollatedObjectPropertyTemplateModel extends ObjectPropertyTemplateM
String invalidConfigMessage = checkConfiguration(); String invalidConfigMessage = checkConfiguration();
if ( ! invalidConfigMessage.isEmpty() ) { if ( ! invalidConfigMessage.isEmpty() ) {
throw new InvalidConfigurationException("Invalid configuration for property " + throw new InvalidConfigurationException("Invalid configuration for collated property " +
op.getURI() + ":" + invalidConfigMessage); op.getURI() + ":" + invalidConfigMessage + ". Creating uncollated display instead.");
} }
/* Get the data */ /* Get the data */

2
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
View file

@ -141,7 +141,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
try { try {
return new CollatedObjectPropertyTemplateModel(op, subject, vreq, policyHelper); return new CollatedObjectPropertyTemplateModel(op, subject, vreq, policyHelper);
} catch (InvalidConfigurationException e) { } catch (InvalidConfigurationException e) {
log.error(e); log.warn(e);
return new UncollatedObjectPropertyTemplateModel(op, subject, vreq, policyHelper); return new UncollatedObjectPropertyTemplateModel(op, subject, vreq, policyHelper);
} }
} else { } else {