Merge branch 'master' into kcls_dcl53

[evergreen-equinox.git] / Open-ILS / web / js / dojo / openils / widget / AutoFieldWidget.js

diff --git a/Open-ILS/web/js/dojo/openils/widget/AutoFieldWidget.js b/Open-ILS/web/js/dojo/openils/widget/AutoFieldWidget.js
index 1db121a..e171f30 100644 (file)
--- a/Open-ILS/web/js/dojo/openils/widget/AutoFieldWidget.js
+++ b/Open-ILS/web/js/dojo/openils/widget/AutoFieldWidget.js
@@ -271,6 +271,16 @@ if(!dojo._hasResource['openils.widget.AutoFieldWidget']) {
                     case 'timestamp':
                         dojo.require('dijit.form.DateTextBox');
                         dojo.require('dojo.date.stamp');
+                        if(!this.dijitArgs.constraints) {
+                            this.dijitArgs.constraints = {};
+                        }
+                        if(!this.dijitArgs.constraints.datePattern) {
+                            var user = new openils.User().user;
+                            if(user.ws_ou()) {
+                                var datePattern = fieldmapper.aou.fetchOrgSettingDefault(user.ws_ou(), 'format.date');
+                                if(datePattern) this.dijitArgs.constraints.datePattern = datePattern.value;
+                            }
+                        }
                         this.widget = new dijit.form.DateTextBox(this.dijitArgs, this.parentNode);
                         if (this.widgetValue != null) {
                             this.widgetValue = openils.Util.timeStampAsDateObj(
@@ -573,7 +583,8 @@ if(!dojo._hasResource['openils.widget.AutoFieldWidget']) {
                 // invalid data.  This change tells dojo to pretend this focusing has 
                 // already happened so we can style required widgets during page render.
                 this.widget._hasBeenBlurred = true;
-                this.widget.validate();
+                if(this.widget.validate)
+                    this.widget.validate();
             }
         },