Skip to content

fix: Wrong route defined in user accounts for admin #3193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 29, 2019
Merged

fix: Wrong route defined in user accounts for admin #3193

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1c95d7
Wrong route defined in user accounts for admin
prateekj117 Jun 24, 2019
7085457
Wrong route defined in user accounts for admin in other places
prateekj117 Jun 25, 2019
5cf2f76
Merge branch 'development' into route-admin-accounts
prateekj117 Jun 26, 2019
6ec40c7
Merge branch 'development' into route-admin-accounts
prateekj117 Jun 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/admin/users.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { computed } from '@ember/object';
export default Controller.extend({
onSessionRoute: computed('routing.currentRouteName', function() {
let currentRouteName = this.get('routing.currentRouteName');
const routes = ['admin.users.view.index', 'admin.users.view.sessions.list', 'admin.users.view.tickets.list', 'admin.users.view.events.list', 'admin.users.view.account.contact-info', 'admin.users.view.account.email-preferences', 'admin.users.view.account.applications'];
const routes = ['admin.users.view.index', 'admin.users.view.sessions.list', 'admin.users.view.tickets.list', 'admin.users.view.events.list', 'admin.users.view.account.profile', 'admin.users.view.account.email-preferences', 'admin.users.view.account.applications'];
return !routes.includes(currentRouteName);
})
});
Expand Down
2 changes: 1 addition & 1 deletion app/templates/admin/users/view/account.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="row">
<div class="sixteen wide column">
{{#tabbed-navigation}}
{{#link-to 'admin.users.view.account.contact-info' model.user.id class='item'}}
{{#link-to 'admin.users.view.account.profile' model.user.id class='item'}}
{{t 'Profile Info'}}
{{/link-to}}
{{#link-to 'admin.users.view.account.email-preferences' model.user.id class='item'}}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/ui-table/cell/admin/users/cell-user-links.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
{{#link-to 'admin.users.view.tickets' record.id}} {{t 'Tickets'}} {{/link-to}}
</div>
<div class="item">
{{#link-to 'admin.users.view.account.contact-info' record.id}} {{t 'Accounts'}} {{/link-to}}
{{#link-to 'admin.users.view.account.profile' record.id}} {{t 'Accounts'}} {{/link-to}}
</div>
</div>