Changeset 1368 for extensions

Timestamp:

May 23, 2011, 2:31:26 PM (12 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #321: Consentform cannot be registered if date is missing

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/consentform.jsp (modified) (1 diff)
• src/net/sf/basedb/reggie/servlet/ConsentFormServlet.java (modified) (1 diff)

extensions/net.sf.basedb.reggie/trunk/resources/consentform.jsp

@@ -249 +249 @@
   if (consentDate == '')
   {
-    setInputStatus('consentDate', 'Missing', 'invalid');
-    return;
+    setInputStatus('consentDate', 'Missing', 'warning');
   }
   else

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/ConsentFormServlet.java

@@ -177 +177 @@
         }
         Reggie.setAnnotationValue(theCase, consentType, consent);
-        Reggie.setAnnotationValue(theCase, consentDateType, consentDate);
+        if (consentDate != null) Reggie.setAnnotationValue(theCase, consentDateType, consentDate);
         
         dc.commit();