Merge branch 'release/0.118.4'

CenterForOpenScience · Apr 5, 2018 · 2514fc6 · 2514fc6
2 parents e7beff9 + 55905c5
commit 2514fc6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.118.4] - 2018-04-05
+### Fixed
+- Automatic opening of upload section on branded provider submit page
+
+### Removed
+- Unused image code
+
 ## [0.118.3] - 2018-03-12
 ### Added
 - Event Tracking to `Select a Preprint Provider` on preprint upload

diff --git a/app/components/preprint-form-header.js b/app/components/preprint-form-header.js
@@ -1,6 +1,5 @@
 import Ember from 'ember';
 import CpPanelToggleComponent from 'ember-collapsible-panel/components/cp-panel-toggle';
-import config from 'ember-get-config';
 /**
  * @module ember-preprints
  * @submodule components
@@ -28,7 +27,6 @@ export default CpPanelToggleComponent.extend({
     showValidationIndicator: true,
     valid: null,
     isValidationActive: false,
-    providerAssetsURL: config.providerAssetsURL,
 
     // Calculated properties
     invalid: Ember.computed('valid', 'isValidationActive', function() {

diff --git a/app/templates/submit.hbs b/app/templates/submit.hbs
@@ -40,7 +40,17 @@
                     {{/unless}}
 
                     {{#with _names.[1] as |name|}}
-                        {{#preprint-form-section id='preprint-form-upload' editMode=editMode class="preprint-form-block" name=name allowOpen=(or providerSaved editMode) denyOpenMessage=(t 'submit.please_select_server') errorAction=(action 'error') as |hasOpened|}}
+                        {{#preprint-form-section
+                            id='preprint-form-upload'
+                            editMode=editMode
+                            class="preprint-form-block"
+                            name=name
+                            allowOpen=(or providerSaved editMode)
+                            open=(and theme.isProvider (not editMode))
+                            denyOpenMessage=(t 'submit.please_select_server')
+                            errorAction=(action 'error')
+                            as |hasOpened|
+                        }}
                             {{preprint-form-header editMode=editMode uploadSaveState=uploadSaveState showValidationIndicator=true name=name preprintNode=node preprintFile=model.primaryFile isValidationActive=(upload-validation-active editMode nodeLocked hasOpened) preprintTitle=node.title valid=(not uploadChanged)}}
                             {{#preprint-form-body}}
                                 {{#liquid-bind filePickerState class='translate' as |currentState|}}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "preprint-service",
-  "version": "0.118.3",
+  "version": "0.118.4",
   "description": "Center for Open Science Preprint Service",
   "private": true,
   "directories": {