fix node4good#83

leonardoalifraco · Jan 20, 2014 · ddd65eb · ddd65eb
1 parent e513525
commit ddd65eb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/example/classic/models/tests.js b/example/classic/models/tests.js
@@ -69,7 +69,7 @@ schema.methods.toString = function () {return this.string_req};
 
 schema.formage = {
     filters: ['ref', 'string_req'],
-    list: ['embeded.name1', 'ref', 'filepicker', 'filepicker_picture', 'filepicker_aviary', 'swizzle'],
+    list: ['embeded.name1', 'ref', 'filepicker', 'filepicker_picture', 'filepicker_aviary', 'swizzle', 'date'],
     subCollections: [{label: 'Sub Tests', model: 'pages', field:'ref'}],
     list_populate: ['ref']
 };

diff --git a/generated/templates.js b/generated/templates.js
@@ -209,6 +209,7 @@ var cloudinary_url = value_url && value.url.split('/upload/')[0] + '/upload/c_fi
 var geomery = value && value.geometry && value.geometry.lat + ',' + value.geometry.lng;
 var maps_url = geomery && 'https://maps.google.com/?q=' + geomery;
 var filename = value && value.filename;
+var date_string = value && value.toISOString ? value.toISOString().split('T')[0] : '';
 switch (type){
 case 'Picture':
 buf.push("<a" + (jade.attrs({ 'href':(value_url), 'target':('_blank') }, {"href":true,"target":true})) + "><img" + (jade.attrs({ 'src':(cloudinary_url) }, {"src":true})) + "/></a>");
@@ -243,7 +244,7 @@ buf.push.apply(buf, jade.indent);
 buf.push("<div class=\"bool\"><i" + (jade.attrs({ "class": [((value ? 'icon-ok' : 'icon-remove'))] }, {"class":true})) + "></i></div>");
   break;
 case 'Date':
-buf.push("<a" + (jade.attrs({ 'href':(document_url) }, {"href":true})) + ">" + (jade.escape(null == (jade.interp = value.toISOString().split('T')[0]) ? "" : jade.interp)) + "</a>");
+buf.push("<a" + (jade.attrs({ 'href':(document_url) }, {"href":true})) + ">" + (jade.escape(null == (jade.interp = date_string) ? "" : jade.interp)) + "</a>");
   break;
 default:
 buf.push("<a" + (jade.attrs({ 'href':(document_url) }, {"href":true})) + ">" + (jade.escape(null == (jade.interp = value) ? "" : jade.interp)) + "</a>");

diff --git a/test/common.js b/test/common.js
@@ -57,6 +57,7 @@ global.mockFind = function mockFindFactory(arr) {
             populate: function mockLimit() { return this; },
             skip: function mockLimit() { return this; },
             limit: function mockLimit() { return this; },
+            sort: function mockLimit() { return this; },
             exec: function mockExec(cb) {
                 var p = new Promise(cb);
                 p.fulfill(arr);

diff --git a/test/test-mongoose.js b/test/test-mongoose.js
@@ -556,7 +556,7 @@ describe("high level REST requests on mongoose", function () {
     });
 
 
-    it.skip("view model page 2", function (done) {
+    it("view model page 2", function (done) {
         var Tests = this.registry.models['Tests'].model;
         var old_Tests_find = Tests.find;
         Tests.find = mockFind([new Tests()]);

diff --git a/views/model.jade b/views/model.jade
@@ -6,6 +6,7 @@ mixin fielddesc(value, type, document_url)
     - var geomery = value && value.geometry && value.geometry.lat + ',' + value.geometry.lng;
     - var maps_url = geomery && 'https://maps.google.com/?q=' + geomery;
     - var filename = value && value.filename;
+    - var date_string = value && value.toISOString ? value.toISOString().split('T')[0] : '';
     case type
         when 'Picture'
             a(href=value_url, target='_blank'): img(src=cloudinary_url)
@@ -32,7 +33,7 @@ mixin fielddesc(value, type, document_url)
                 i(class=(value ? 'icon-ok' : 'icon-remove'))
 
         when 'Date'
-            a(href=document_url): =value.toISOString().split('T')[0]
+            a(href=document_url): =date_string
 
         default
             a(href=document_url): =value