Merge branch 'hotfix/21.6.1'

Author: fabmiz

CHANGELOG.md

@@ -4,6 +4,10 @@ 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).
 
+## [21.6.1] - 2021-06-29
+### Fixed
+- Fix missing save/cancel buttons on the registration's license/node-license editable field
+
 ## [21.6.0] - 2021-06-28
 ### Changed
 - Upgraded ember-* to v3.26 (https://github.com/CenterForOpenScience/ember-osf-web/pull/1203)
@@ -1755,7 +1759,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Quick Files
 
-[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/21.6.0...develop
+[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/21.6.1...develop
+[21.6.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.6.1
 [21.6.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.6.0
 [21.5.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.5.1
 [21.5.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.5.0

lib/registries/addon/components/registries-license-picker/template.hbs

@@ -70,23 +70,23 @@
             {{#if this.showText}}
                 <LicenseText @node={{@manager.registration}} />
             {{/if}}
+        {{/if}}
 
-            {{#if this.shouldShowButtons}}
-                <div local-class='Controls'>
-                    <BsButton @type='default' {{on 'click' @manager.cancel}}>
-                        {{t 'general.cancel'}}
-                    </BsButton>
-                    <BsButton
-                        data-analytics-name='Save license'
-                        data-test-save-license
-                        disabled={{@manager.changeset.isInvalid}}
-                        @type='primary'
-                        {{on 'click' @manager.save}}
-                    >
-                        {{t 'general.save'}}
-                    </BsButton>
-                </div>
-            {{/if}}
+        {{#if this.shouldShowButtons}}
+            <div local-class='Controls'>
+                <BsButton @type='default' {{on 'click' @manager.cancel}}>
+                    {{t 'general.cancel'}}
+                </BsButton>
+                <BsButton
+                    data-analytics-name='Save license'
+                    data-test-save-license
+                    disabled={{@manager.changeset.isInvalid}}
+                    @type='primary'
+                    {{on 'click' @manager.save}}
+                >
+                    {{t 'general.save'}}
+                </BsButton>
+            </div>
         {{/if}}
     </div>
 </FormControls>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-osf-web",
-  "version": "21.6.0",
+  "version": "21.6.1",
   "description": "Ember front-end for the Open Science Framework",
   "license": "Apache-2.0",
   "author": "Center for Open Science <support@cos.io>",