fix(files): use files.origin

Closes #532
NCI-GDC · Mar 13, 2015 · 9da26db · 9da26db
1 parent 57c58dd
commit 9da26db
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/app/scripts/files/module.ts b/app/scripts/files/module.ts
@@ -37,7 +37,8 @@ module ngApp.files {
               "related_files.file_name",
               "related_files.md5sum",
               "annotations.annotation_id",
-              "tags"
+              "tags",
+              "origin"
             ]
           });
         }

diff --git a/app/scripts/files/templates/file.html b/app/scripts/files/templates/file.html
@@ -46,7 +46,7 @@ <h3 class="panel-title pull-left" data-translate>File Properties</h3>
           </tr>
           <tr>
             <th scope="row" data-translate>File Origin</th>
-            <td>{{ ::fc.file.file_origin | humanify }}</td>
+            <td>{{ ::fc.file.origin | humanify }}</td>
           </tr>
           <tr>
             <th scope="row" data-translate>Data format</th>

diff --git a/app/scripts/search/search.controllers.ts b/app/scripts/search/search.controllers.ts
@@ -93,6 +93,7 @@ module ngApp.search.controllers {
           "archive.revision",
           "access",
           "state",
+          "origin",
           "data_format",
           "center.name"
         ]

diff --git a/app/scripts/search/templates/search.files.facets.html b/app/scripts/search/templates/search.files.facets.html
@@ -6,8 +6,9 @@
 <terms data-name="files.data_subtype" data-title="Data Subtype" data-facet="sc.files.aggregations.data_subtype"></terms>
 <terms data-name="files.experimental_strategy" data-title="Experimental Strategy" data-facet="sc.files.aggregations.experimental_strategy"></terms>
 <terms data-name="files.data_format" data-title="Data Format" data-facet="sc.files.aggregations.data_format" data-collapsed="true"></terms>
-<terms data-name="files.state" data-title="File Status" data-facet="sc.files.aggregations.state" data-collapsed="true"></terms>
+<terms data-name="files.origin" data-title="File Origin" data-facet="sc.files.aggregations.origin" data-collapsed="true"></terms>
 <terms data-name="files.platform" data-title="Platform" data-facet="sc.files.aggregations.platform" data-collapsed="true"></terms>
 <terms data-name="files.archive.revision" data-title="Revision" data-facet="sc.files.aggregations['archive.revision']" data-collapsed="true"></terms>
 <terms data-name="files.access" data-title="Access Level" data-facet="sc.files.aggregations.access" data-collapsed="true"></terms>
 <terms data-name="files.center.name" data-title="Data Submitter" data-facet="sc.files.aggregations['center.name']" data-collapsed="true"></terms>
+<terms data-name="files.state" data-title="File Status" data-facet="sc.files.aggregations.state" data-collapsed="true"></terms>