Remove duplicate mixins
This commit is contained in:
parent
cd082ef616
commit
60f518d911
9 changed files with 9 additions and 18 deletions
|
@ -1,4 +1,3 @@
|
||||||
import Ember from 'ember';
|
import Ember from 'ember';
|
||||||
import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
|
|
||||||
|
|
||||||
export default Ember.Route.extend(AuthenticatedRouteMixin);
|
export default Ember.Route.extend({});
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
import Ember from 'ember';
|
import Ember from 'ember';
|
||||||
import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
|
|
||||||
|
|
||||||
export default Ember.Route.extend(AuthenticatedRouteMixin, {
|
export default Ember.Route.extend({
|
||||||
model: function() {
|
model: function() {
|
||||||
return this.store.findAll('characteristic');
|
return this.store.findAll('characteristic');
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
import Ember from 'ember';
|
import Ember from 'ember';
|
||||||
import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
|
|
||||||
|
|
||||||
export default Ember.Route.extend(AuthenticatedRouteMixin, {
|
export default Ember.Route.extend({
|
||||||
beforeModel: function(transition) {
|
beforeModel: function(transition) {
|
||||||
this._super(transition);
|
this._super(transition);
|
||||||
this.transitionTo('protected.compare');
|
this.transitionTo('protected.compare');
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
import Ember from 'ember';
|
import Ember from 'ember';
|
||||||
import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
|
|
||||||
|
|
||||||
export default Ember.Route.extend(AuthenticatedRouteMixin, {});
|
export default Ember.Route.extend({});
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
import Ember from 'ember';
|
import Ember from 'ember';
|
||||||
import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
|
|
||||||
|
|
||||||
export default Ember.Route.extend(AuthenticatedRouteMixin, {
|
export default Ember.Route.extend({
|
||||||
afterModel: function(species) {
|
afterModel: function(species) {
|
||||||
if (!species.get('canEdit')) {
|
if (!species.get('canEdit')) {
|
||||||
this.transitionTo('species.show', species.get('id'));
|
this.transitionTo('species.show', species.get('id'));
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
import Ember from 'ember';
|
import Ember from 'ember';
|
||||||
import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
|
|
||||||
|
|
||||||
export default Ember.Route.extend(AuthenticatedRouteMixin, {
|
export default Ember.Route.extend({
|
||||||
beforeModel: function(transition) {
|
beforeModel: function(transition) {
|
||||||
this._super(transition);
|
this._super(transition);
|
||||||
if (this.get('session.currentUser.role') === 'R') {
|
if (this.get('session.currentUser.role') === 'R') {
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
import Ember from 'ember';
|
import Ember from 'ember';
|
||||||
import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
|
|
||||||
|
|
||||||
export default Ember.Route.extend(AuthenticatedRouteMixin, {
|
export default Ember.Route.extend({
|
||||||
model: function(params) {
|
model: function(params) {
|
||||||
return this.store.findRecord('species', params.species_id, { reload: true });
|
return this.store.findRecord('species', params.species_id, { reload: true });
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
import Ember from 'ember';
|
import Ember from 'ember';
|
||||||
import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
|
|
||||||
|
|
||||||
export default Ember.Route.extend(AuthenticatedRouteMixin, {
|
export default Ember.Route.extend({
|
||||||
model: function() {
|
model: function() {
|
||||||
return this.store.findAll('strain');
|
return this.store.findAll('strain');
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
import Ember from 'ember';
|
import Ember from 'ember';
|
||||||
import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
|
|
||||||
|
|
||||||
export default Ember.Route.extend(AuthenticatedRouteMixin, {
|
export default Ember.Route.extend({
|
||||||
beforeModel: function(transition) {
|
beforeModel: function(transition) {
|
||||||
this._super(transition);
|
this._super(transition);
|
||||||
if (this.get('session.currentUser.role') === 'R') {
|
if (this.get('session.currentUser.role') === 'R') {
|
||||||
|
|
Reference in a new issue