Removes ShowMapButton conditional for template avdeling do to weird bug

emberjs/ember.js#2031
telemark · Apr 10, 2014 · 83efd68 · 83efd68
1 parent e99d8f0
commit 83efd68
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/index.html b/index.html
@@ -10,7 +10,7 @@
 </head>
 <body>
 
-  <script type="text/x-handlebars">
+  <script type="text/x-handlebars" id="application">
       <div class="header">
      <ul class="nav nav-pills pull-right">
        {{#link-to 'index' tagName='li'}}
@@ -131,11 +131,9 @@ <h1>{{departmentName}}</h1>
           {{#link-to 'avdeling.ansatte' tagName='li'}}
             <a {bind-attr href="view.href"}>Vis ansatte</a>
           {{/link-to}}
-          {{#unless ShowMapButton}}
-              {{#link-to 'avdeling.kart' tagName='li'}}
-                <a {bind-attr href="view.href"}>Vis kart</a>
-              {{/link-to}}
-          {{/unless}}
+          {{#link-to 'avdeling.kart' tagName='li'}}
+            <a {bind-attr href="view.href"}>Vis kart</a>
+          {{/link-to}}
       </ul>
       {{outlet}}
   </script>

diff --git a/js/app.js b/js/app.js
@@ -40,6 +40,8 @@ App.SearchRoute = Ember.Route.extend({
 })
 
 App.AvdelingerController = Ember.ArrayController.extend({
+  sortProperties: ['departmentName'],
+  sortAscending: true,
   itemController: 'avdeling'
 });
 
@@ -56,7 +58,6 @@ App.AvdelingerRoute = Ember.Route.extend({
 });
 
 App.AvdelingController = Ember.ObjectController.extend({
-  ShowMapButton: false,
   realUrl:'',
   realMail:'',
   formattedUrl: function(){