Removed dependency on narwhal/util.

gmosx · Jul 18, 2010 · f3b7a66 · f3b7a66 · polgfred · Jul 22, 2010
1 parent aa5f474
commit f3b7a66
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/google/appengine/ext/db/forms.js b/lib/google/appengine/ext/db/forms.js
@@ -110,7 +110,7 @@ ModelForm.prototype.asList = ModelForm.prototype.asUl = function () {
 
     for (var i in properties) {
         var p = properties[i];
-        html.push('<li id="' + p.name + '-field"><label for="' + p.name + '"' + (p.required ? ' class="required"' : "") + '>' + p.verbose() + '</label>' + p.getFormField(obj) + '</li>');
+        html.push('<li id="' + p.name + '-field"><label for="' + p.name + '"' + (p.required ? ' class="required"' : "") + '>' + (p.verboseName || p.name) + '</label>' + p.getFormField(obj) + '</li>');
     }
 
     return html.join("");

diff --git a/lib/google/appengine/ext/db/properties.js b/lib/google/appengine/ext/db/properties.js
@@ -14,8 +14,7 @@ var TYPES = require("google/appengine/api/datastore/types"),
     Key = TYPES.Key,
     GeoPt = TYPES.GeoPt;
 
-var util = require("narwhal/util"),
-    utils = require("google/appengine/utils"),
+var utils = require("google/appengine/utils"),
 	users = require("google/appengine/api/users");
 
 // property constructor helper.
@@ -46,11 +45,12 @@ var Property = exports.Property = function (options) {
     if (this.required == undefined) this.required = false;
     if (this.indexed == undefined) this.indexed = true;
 }
-
+/** REMOVE me (dependency on narwhal-lib not worth it)
+var util = require("narwhal/util");
 Property.prototype.verbose = function () {
     return (this.verboseName || util.title(this.name));
 }
-
+*/
 Property.prototype.validate = function (value) {
     if (this.empty(value)) {
         if (this.required) throw new BadValueError(this.verbose() + " is required");