End of day commit

app/assets/javascripts/supplier/app/controllers/settings_controller.js.coffee

@@ -1,14 +1,15 @@
 App.SettingsController = Ember.Controller.extend
   needs: ['application']
+  supplier: Ember.computed.alias 'globals.current_supplier'
   # model: (-> @get('controllers.application.supplier')).property('controllers.application.supplier')
   time_zones: (-> window.time_zones ).property()
   countries: (-> window.countries ).property()
   saving: false
-  editIensProfile: (-> @get('model.country') is 'Netherlands' ).property('model.country')
+  editIensProfile: (-> @get('supplier.country') is 'Netherlands' ).property('supplier.country')
   actions:
     saveSettings: ->
       @set 'saving', true
-      @get('model').save().then (supplier) =>
+      @get('supplier').save().then (supplier) =>
         @set 'saving', false
-        $('.top-menu .supplier-name').text @get('model.name')
+        $('.top-menu .supplier-name').text @get('supplier.name')
         @transitionToRoute 'index'

app/assets/javascripts/supplier/app/routes/settings_route.js.coffee

@@ -1,5 +1,7 @@
 App.SettingsRoute = Ember.Route.extend
-  model: -> @get('globals.current_supplier')
+  a: 3
+  #model: -> @get('globals.current_supplier')
+  #model: Ember.computed.alias 'globals.current_supplier'
   # setupController: (controller, model)->
   #   #controller.set 'model', controller.get('controllers.application.supplier')
   #   controller.set 'model', model.supplier

app/assets/javascripts/supplier/app/store.js.coffee

@@ -8,5 +8,5 @@ App.ApplicationStore = DS.Store
     #Ember.String.pluralize(Ember.String.decamelize(type))
 App.ApplicationAdapter = DS.ActiveModelAdapter.extend
   namespace: 'supplier'
-  #headers:
-    #"Accept": "application/json, text/javascript; q=0.01"
+  headers:
+    "Accept": "application/json, text/javascript; q=0.01"

app/assets/javascripts/supplier/app/templates/settings.emblem

@@ -1,39 +1,39 @@
 .row: .small-12.columns: h2=t 'settings.title'
 .form-row
   .form-label: label=t 'attributes.supplier.name'
-  .form-field= input value=controller.model.name classNames="supplier-name"
+  .form-field= input value=supplier.name classNames="supplier-name"
 .form-row
   .form-label: label=t 'attributes.supplier.email'
-  .form-field= input value=controller.model.email type="email" classNames="supplier-email"
+  .form-field= input value=supplier.email type="email" classNames="supplier-email"
 /input.location_picker name="location" type="text" valueBinding="location"
 /.form-row
   .location_picker_map
   = image_tag 'supplier/settings/location-balloon.png'
 /.form-row
   .form-label: label=t 'attributes.supplier.time_zone'
-  .form-field: Ember.Select content=time_zones optionValuePath="content.name"  optionLabelPath="content.formatted" valueBinding="controller.model.time_zone"
+  .form-field: Ember.Select content=time_zones optionValuePath="content.name"  optionLabelPath="content.formatted" valueBinding="supplier.time_zone"
 .form-row
   .form-label: label=t 'attributes.supplier.address'
   .form-field.full
     .row
-      .large-8.medium-8.columns= input value=controller.model.address
+      .large-8.medium-8.columns= input value=supplier.address
       .large-1.show-for-large-up.columns  
-      .large-2.medium-2.small-3.columns= number-field numericValue=controller.model.house_number
-      .large-1.medium-2.small-2.columns= input value=controller.model.house_number_addition
+      .large-2.medium-2.small-3.columns= number-field numericValue=supplier.house_number
+      .large-1.medium-2.small-2.columns= input value=supplier.house_number_addition
 .form-row
   .form-label: label=t 'attributes.supplier.postal_code'
-  .form-field= input value=controller.model.postal_code
+  .form-field= input value=supplier.postal_code
 .form-row
   .form-label: label=t 'attributes.supplier.city'
-  .form-field= input value=controller.model.city
+  .form-field= input value=supplier.city
 .form-row
   .form-label: label=t 'attributes.supplier.country'
-  .form-field: view "select" content=countries optionValuePath="content.name"  optionLabelPath="content.name" value=controller.model.country
+  .form-field: view "select" content=countries optionValuePath="content.name"  optionLabelPath="content.name" value=supplier.country
 if editIensProfile
   .form-row
     .form-label: label=t 'attributes.supplier.iens_profile'
     .form-field
-      = number-field numericValue=controller.model.iens_profile
+      = number-field numericValue=supplier.iens_profile
       = image_tag 'supplier/settings/iens-example.png'
       span=t "settings.reviews.explanation"
 .row: .small-12.columns= language-switcher