Merge branch 'master' of github.com:webhook/webhook-cms

webhook · Mar 21, 2014 · d6b8ecd · d6b8ecd
2 parents 08c2a6a + 83e752c
commit d6b8ecd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/app/routes/wh/content/type/index.js b/app/routes/wh/content/type/index.js
@@ -18,6 +18,7 @@ export default Ember.Route.extend({
         cmsControls = contentType.get('controls');
 
     controller.set('cmsControls', cmsControls);
+    controller.set('columnChoices', cmsControls.rejectBy('name', 'preview_url'));
     controller.set('contentType', contentType);
 
     var lockedItems = Ember.A([]),

diff --git a/app/templates/wh/content/type/index.hbs b/app/templates/wh/content/type/index.hbs
@@ -11,7 +11,7 @@
     <span class="btn btn-neutral btn-small icon icon-table"> Display <span class="caret"></span></span>
     <dl class="wy-dropdown-menu">
       <dt>Show columns</dt>
-      {{#each contentType.controls}}
+      {{#each columnChoices}}
         <dd>
           <span {{bind-attr class=":icon showInCms:icon-ok-sign:icon-circle-blank"}} {{action "toggleShowInCms" this on="click"}}>
             {{label}}

diff --git a/app/utils/controls.js b/app/utils/controls.js
@@ -39,6 +39,8 @@ export default function dataFromControls (controls) {
     // add timezone to datetime values
     if (control.get('controlType.widget') === 'datetime') {
       value = moment(value).format();
+      // add extra data for sorting
+      data['_sort_' + control.get('name')] = moment(value).unix();
     }
 
     data[control.get('name')] = value;