Reader/Feed.bjs

Reader/Feed.js
Reader/templates/Feed.html

diff --git a/Reader/Feed.bjs b/Reader/Feed.bjs
index df84117..b9ffe0e 100644 (file)
--- a/Reader/Feed.bjs
+++ b/Reader/Feed.bjs
@@ -84,7 +84,7 @@
          "$ String url" : "baseURL + '/Api/Reader_read'"
         },
         {
-         "$ Array fields" : "[\n        \"id\",\n            \"article_id\",\n            \"has_read\",\n            \"article_id_id\" ,\n            \"article_id_published_dt\" ,\n            \"article_id_headline\" ,\n            \"article_id_body\" ,\n            \"article_id_real_url\" ,\n            'article_id_body'\n        ]\n    ",
+         "$ Array fields" : "[\n        \"id\",\n            \"article_id\",\n            \"has_read\",\n            \"article_id_id\" ,\n            \"article_id_published_dt\" ,\n            \"article_id_headline\" ,\n            \"article_id_body\" ,\n            \"article_id_real_url\" ,\n            'article_id_body_txt'\n        ]\n    ",
          "xtype" : "JsonReader",
          "$ xns" : "Roo.data",
          "* prop" : "reader"
@@ -93,7 +93,7 @@
       },
       {
        "String dataIndex" : "article_id_headline",
-       "$ Function renderer" : "function(v,x,r) {\n   \n   return String.format(\n            '<h3>{0}</h3><small>{1}</small><i class=\"rss-list-body\">{2}</i>' + \n                '<span class=\"badge\">{3}</span><i class=\"fa fa-chevron-right\"></i>',\n        r.data.article_id_headline,\n        r.data.article_id_published_dt,\n        r.data.article_id_body_txt,\n        r.data.has_read ? \"Read\" : ''\n    );\n            \n\n\n }",
+       "$ Function renderer" : "function(v,x,r) {\n   \n   return String.format(\n            '<h3>{0}</h3><small>{1}</small><i class=\"rss-list-body\">{2}</i>' + \n                '{3}<i class=\"fa fa-chevron-right\"></i>',\n        r.data.article_id_headline,\n        r.data.article_id_published_dt,\n        r.data.article_id_body_txt,\n        r.data.has_read * 1 ? '<span class=\"badge\">Read</span>' : ''\n    );\n            \n \n }",
        "xtype" : "ColumnModel",
        "$ xns" : "Roo.grid",
        "* prop" : "cm[]"

diff --git a/Reader/Feed.js b/Reader/Feed.js
index fdb7965..4d88207 100644 (file)
--- a/Reader/Feed.js
+++ b/Reader/Feed.js
@@ -116,7 +116,7 @@ Feed = new Roo.XComponent({
                    "article_id_headline" ,
                    "article_id_body" ,
                    "article_id_real_url" ,
-                   'article_id_body'
+                   'article_id_body_txt'
                ],
        xns : Roo.data,
        '|xns' : 'Roo.data',
@@ -130,15 +130,14 @@ Feed = new Roo.XComponent({
           
           return String.format(
                    '<h3>{0}</h3><small>{1}</small><i class="rss-list-body">{2}</i>' + 
-                       '<span class="badge">{3}</span><i class="fa fa-chevron-right"></i>',
+                       '{3}<i class="fa fa-chevron-right"></i>',
                r.data.article_id_headline,
                r.data.article_id_published_dt,
                r.data.article_id_body_txt,
-               r.data.has_read ? "Read" : ''
+               r.data.has_read * 1 ? '<span class="badge">Read</span>' : ''
            );
                    
-       
-       
+        
         },
        xns : Roo.grid,
        '|xns' : 'Roo.grid',