Skip to content

Commit

Permalink
Merge branch 'hotfix/18.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
jamescdavis committed Nov 5, 2018
2 parents d68e43d + 1563590 commit 4f0382e
Show file tree
Hide file tree
Showing 7 changed files with 251 additions and 135 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ 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).

## [18.1.1] - 2018-11-05
- Routes:
- `guid-node/registrations` - fix sorting of registration schema on new registration modal
- Engines:
- `registries` - page resetting and scrolling fixes

## [18.1.0] - 2018-10-30
### Added
- Components:
Expand Down
2 changes: 1 addition & 1 deletion app/guid-node/registrations/controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default class GuidNodeRegistrations extends Controller {
let schemas = yield this.store.findAll('registration-schema');
schemas = schemas.toArray();
schemas.sort((a: RegistrationSchema, b: RegistrationSchema) => {
return a.name.length > b.name.length;
return a.name.length - b.name.length;
});
this.set('defaultSchema', schemas.firstObject);
this.set('selectedSchema', this.defaultSchema);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<ul local-class="ul">
{{#each items as |item|}}
<li local-class="li">
<button local-class="{{if (eq current item.text) 'active'}}"
<button data-test-page="{{item.text}}" local-class="{{if (eq current item.text) 'active'}}"
{{action (or item.action 'setPage') item.text}}
disabled={{item.disabled}}
>
Expand Down
Loading

0 comments on commit 4f0382e

Please sign in to comment.