From ba2fcd2f2d4045ef7c9a13e24c68bc79bfa5120c Mon Sep 17 00:00:00 2001
From: Agnieszka Figiel <agnieszka.figiel@gmail.com>
Date: Thu, 25 Aug 2016 11:15:15 +0200
Subject: [PATCH] collapse all error lists when opening error

---
 .../controllers/annual_report_upload_controller.js.coffee     | 1 +
 .../trade/templates/annual_report_upload.handlebars           | 4 ++--
 .../annual_report_upload/validation_errors_view.js.coffee     | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/trade/controllers/annual_report_upload_controller.js.coffee b/app/assets/javascripts/trade/controllers/annual_report_upload_controller.js.coffee
index abce7dfa88..843c7693ed 100644
--- a/app/assets/javascripts/trade/controllers/annual_report_upload_controller.js.coffee
+++ b/app/assets/javascripts/trade/controllers/annual_report_upload_controller.js.coffee
@@ -40,6 +40,7 @@ Trade.AnnualReportUploadController = Ember.ObjectController.extend Trade.Flash,
 
     transitionToSandboxShipments: (error) ->
       @set('currentError', error)
+      @notifyPropertyChange('allErrorsCollapsed')
       params = {
         validation_error_id: error.get('id')
         page: 1
diff --git a/app/assets/javascripts/trade/templates/annual_report_upload.handlebars b/app/assets/javascripts/trade/templates/annual_report_upload.handlebars
index 63c79e390e..41bd03a94c 100644
--- a/app/assets/javascripts/trade/templates/annual_report_upload.handlebars
+++ b/app/assets/javascripts/trade/templates/annual_report_upload.handlebars
@@ -24,14 +24,14 @@
     errorType="active"
     content=validationErrors
     collapsed=false
-    controller=this}}
+  }}
 
   {{view Trade.ValidationErrorsView
     heading="Ignored validation errors"
     errorType="ignored"
     content=ignoredValidationErrors
     collapsed=true
-    controller=this}}
+  }}
 </div>
 
 {{ outlet }}
diff --git a/app/assets/javascripts/trade/views/annual_report_upload/validation_errors_view.js.coffee b/app/assets/javascripts/trade/views/annual_report_upload/validation_errors_view.js.coffee
index 0954a9bf9f..ac896f6f51 100644
--- a/app/assets/javascripts/trade/views/annual_report_upload/validation_errors_view.js.coffee
+++ b/app/assets/javascripts/trade/views/annual_report_upload/validation_errors_view.js.coffee
@@ -17,6 +17,8 @@ Trade.ValidationErrorsView = Ember.View.extend
     # reset default collapse setting
     if @get('controller.allErrorsCollapsed') == null
       @set('collapsed', @get('defaultCollapsed'))
+    else
+      @set('collapsed', true)
   ).observes('controller.allErrorsCollapsed')
 
   toggleHint: ( ->