-
Notifications
You must be signed in to change notification settings - Fork 4.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Upgrade ember-can * can service > abilities service, backwards incompat change of classname * Hack around not being able to have Service ability cos `service:` * Fix up bug and make sure all our stuff uses our own can helper
- Loading branch information
Showing
10 changed files
with
961 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ckages/consul-ui/app/abilities/service.js → ...ckages/consul-ui/app/abilities/zervice.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
import Helper from 'ember-can/helpers/can'; | ||
|
||
export default class extends Helper { | ||
_addAbilityObserver(ability, propertyName) { | ||
if(!this.isDestroyed && !this.isDestroying) { | ||
super._addAbilityObserver(...arguments); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
ui/packages/consul-ui/app/services/can.js → ...kages/consul-ui/app/services/abilities.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
import Service from 'ember-can/services/can'; | ||
|
||
export default class CanService extends Service { | ||
export default class AbilitiesService extends Service { | ||
parse(str) { | ||
// It's nicer to talk about SSO but technically its part of the authMethod | ||
// ability, we probably only need 'use SSO' but if we need more, reassess | ||
// the `replace` | ||
return super.parse(str.replace('use SSO', 'use authMethods')); | ||
return super.parse(str.replace('use SSO', 'use authMethods').replace('service', 'zervice')); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.