Merge f0a994c into fefc728

CenterForOpenScience · Feb 27, 2019 · 902adf3 · 902adf3
2 parents fefc728 + f0a994c
commit 902adf3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/app/controllers/preprints/provider/preprint-detail.js b/app/controllers/preprints/provider/preprint-detail.js
@@ -140,7 +140,7 @@ export default Controller.extend({
             'preprint',
             preprintId,
             { include: ['node', 'license', 'review_actions', 'contributors'] },
-        ).catch(() => this.replaceWith('page-not-found'));
+        ).catch(() => this.replaceRoute('page-not-found'));
 
         this.set('preprint', response);
         this.set('authors', response.get('contributors'));

diff --git a/app/routes/application.js b/app/routes/application.js
@@ -16,7 +16,8 @@ export default Route.extend(OSFAgnosticAuthRouteMixin, {
     session: service(),
     currentUser: service(),
 
-    afterModel() {
+    beforeModel() {
+        this._super(...arguments);
         const availableLocales = this.get('i18n.locales').toArray();
         let locale;
 

diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
     "use-ember-osf-next-interfaces": "yarn upgrade @centerforopenscience/ember-osf@https://github.com/CenterForOpenScience/ember-osf.git#release/next-interfaces#$(date -u +%FT%TZ)"
   },
   "devDependencies": {
-    "@centerforopenscience/ember-osf": "https://github.com/CenterForOpenScience/ember-osf.git#develop#2019-02-04T16:55:50Z",
+    "@centerforopenscience/ember-osf": "https://github.com/CenterForOpenScience/ember-osf.git#develop#2019-02-27T17:50:28Z",
     "@centerforopenscience/eslint-config": "^2.0.0",
     "@centerforopenscience/osf-style": "1.8.0",
     "@cos-forks/ember-content-placeholders": "https://github.com/cos-forks/ember-content-placeholders#c85cdbeb4b9c206c3f76a92422db76815b2c95bc",

diff --git a/yarn.lock b/yarn.lock
@@ -54,9 +54,9 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@centerforopenscience/ember-osf@https://github.com/CenterForOpenScience/ember-osf.git#develop#2019-02-04T16:55:50Z":
+"@centerforopenscience/ember-osf@https://github.com/CenterForOpenScience/ember-osf.git#develop#2019-02-27T17:50:28Z":
   version "0.22.1"
-  resolved "https://github.com/CenterForOpenScience/ember-osf.git#c5476c85de99c71fdf40ec9e49e69575328f470c"
+  resolved "https://github.com/CenterForOpenScience/ember-osf.git#2ae38f4c08056fdfbe48505bcb03b44db7db9c20"
   dependencies:
     broccoli-funnel "1.2.0"
     broccoli-merge-trees "2.0.0"
@@ -110,7 +110,6 @@
 "@centerforopenscience/osf-style@1.8.0":
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/@centerforopenscience/osf-style/-/osf-style-1.8.0.tgz#adde9771ec09d930b408a39a121ff10b925f2fd5"
-  integrity sha512-s6rwcQN44CVUuRpRihZHEMaDiQ7SBj6rXxisKORCGCq8BEd0GlogGYGHnTIUnNF/aJxufaVwjmLXRcI63FavJA==
 
 "@cos-forks/ember-content-placeholders@https://github.com/cos-forks/ember-content-placeholders#c85cdbeb4b9c206c3f76a92422db76815b2c95bc":
   version "0.5.0"
@@ -3507,7 +3506,6 @@ ember-cookies@^0.0.13:
 ember-cookies@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/ember-cookies/-/ember-cookies-0.3.1.tgz#42ca530703092f6cde691103d608a6a5a58f2d76"
-  integrity sha1-QspTBwMJL2zeaRED1gimpaWPLXY=
   dependencies:
     ember-cli-babel "^6.8.2"
     ember-getowner-polyfill "^1.1.0 || ^2.0.0"