Adds sortorder to search

telemark · Apr 10, 2014 · e99d8f0 · e99d8f0
1 parent 48a2250
commit e99d8f0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/index.html b/index.html
@@ -131,9 +131,11 @@ <h1>{{departmentName}}</h1>
           {{#link-to 'avdeling.ansatte' tagName='li'}}
             <a {bind-attr href="view.href"}>Vis ansatte</a>
           {{/link-to}}
-          {{#link-to 'avdeling.kart' tagName='li'}}
-            <a {bind-attr href="view.href"}>Vis kart</a>
-          {{/link-to}}
+          {{#unless ShowMapButton}}
+              {{#link-to 'avdeling.kart' tagName='li'}}
+                <a {bind-attr href="view.href"}>Vis kart</a>
+              {{/link-to}}
+          {{/unless}}
       </ul>
       {{outlet}}
   </script>

diff --git a/js/app.js b/js/app.js
@@ -22,6 +22,8 @@ App.ApplicationController = Ember.Controller.extend({
 });
 
 App.SearchController = Ember.ArrayController.extend({
+  sortProperties: ['familyName', 'givenName'],
+  sortAscending: true,
   itemController: 'ansatt'
 });
 
@@ -54,6 +56,7 @@ App.AvdelingerRoute = Ember.Route.extend({
 });
 
 App.AvdelingController = Ember.ObjectController.extend({
+  ShowMapButton: false,
   realUrl:'',
   realMail:'',
   formattedUrl: function(){