Merge branch 'master' of https://github.com/cos-labs/share-analytics …

…into remove-contrib-list-component
Rytiggy · Apr 11, 2017 · a0556ab · a0556ab
2 parents dba0c85 + 9d852e2
commit a0556ab
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 65 deletions.
diff --git a/app/components/filter-plaques/component.js b/app/components/filter-plaques/component.js
@@ -37,13 +37,13 @@ export default Ember.Component.extend({
         removeFilter(filter) {
             let queryParams = {};
             queryParams[filter.key] = undefined;
-            this.attrs.transitionToFacet("resultsList", queryParams);
+            this.attrs.transitionToFacet("search", queryParams);
         },
 
         transitionToFacet(parameter, parameterValue) {
             let queryParams = {};
             queryParams[parameter] = parameterValue;
-            this.attrs.transitionToFacet("resultsList", queryParams);
+            this.attrs.transitionToFacet("search", queryParams);
         }
 
     }

diff --git a/app/components/object-detail-widget/template.hbs b/app/components/object-detail-widget/template.hbs
@@ -10,13 +10,13 @@
     {{/if}}
     <div><h3>Contributors</h3><ul>
         {{#each objectData._source.lists.contributors as |contributor|}}
-            <li><a style="cursor: pointer;" {{action "transitionToFacet" "resultsList" "contributors" contributor.id}}>{{contributor.name}}</a></li>
+            <li><a style="cursor: pointer;" {{action "transitionToFacet" "search" "contributors" contributor.id}}>{{contributor.name}}</a></li>
         {{/each}}
     </ul></div>
     {{#if objectData._source.tags}}
         <div><h3>Tags</h3>
             {{#each objectData._source.tags as |tag|}}
-                <span {{action "transitionToFacet" "resultsList" "tags" tag true on="click"}} style="cursor: pointer; display: inline-block; font-size: 12px; background-color: #7ec4dd; color: #fff; padding: 2px 5px 2px 5px ; border: 1px solid color: #6ebfd5; border-radius: 3px; margin: 3px;">{{tag}}</span>
+                <span {{action "transitionToFacet" "search" "tags" tag true on="click"}} style="cursor: pointer; display: inline-block; font-size: 12px; background-color: #7ec4dd; color: #fff; padding: 2px 5px 2px 5px ; border: 1px solid color: #6ebfd5; border-radius: 3px; margin: 3px;">{{tag}}</span>
             {{/each}}
         </div>
     {{/if}}

diff --git a/app/components/results-list/component.js b/app/components/results-list/component.js
@@ -70,7 +70,7 @@ export default Ember.Component.extend({
                 page = 0;
             }
             queryParams["page"] = page
-            this.attrs.transitionToFacet("resultsList", queryParams);
+            this.attrs.transitionToFacet("search", queryParams);
         },
         pagenext() {
             let queryParams = {};
@@ -83,7 +83,7 @@ export default Ember.Component.extend({
                 page = 0;
             }
             queryParams["page"] = page
-            this.attrs.transitionToFacet("resultsList", queryParams);
+            this.attrs.transitionToFacet("search", queryParams);
         }
 
     }

diff --git a/app/components/results-list/template.hbs b/app/components/results-list/template.hbs
@@ -15,9 +15,11 @@
                 </div>--}}
                 <div style="max-width: 700px; color: #888; padding-top: 10px; padding-bottom: 10px;">{{item.description_truncated}}</div>
                 <div class="item-number" style="color: #aaa; float: left; clear: both; font-size: 13px;">
-                    Provided by: {{#each item._source.publishers as |publisher|}}
-                        <span>{{publisher}}</span>
-                    {{/each}}
+                    {{#if item._source.publishers}}
+                        Provided by: {{#each item._source.publishers as |publisher|}}
+                            <span>{{publisher}}</span>
+                        {{/each}}
+                    {{/if}}
                 </div>
                 <div class="item-name" style="cursor: pointer; margin-bottom: 10px; float: right; color: #aaa: padding: 3px 5px 3px 5px;" {{action "transitionToFacet" "objectDetail" "id" item._source.id}}>Details&nbsp;&nbsp;<i class="fa fa-angle-right"></i></div>
             </div>

diff --git a/app/router.js b/app/router.js
@@ -7,8 +7,12 @@ const Router = Ember.Router.extend({
 });
 
 Router.map(function() {
-    this.route('dashboards', function() {
-        this.route('dashboard', {path: ':dashboard'});
+    this.route('dashboards', {
+        path: ""
+    }, function() {
+        this.route('dashboard', {
+            path: ':dashboard'
+        });
     });
 });