diff --git a/core/client/controllers/feature.js b/core/client/controllers/feature.js index bb449f7f41..4f99ec29df 100644 --- a/core/client/controllers/feature.js +++ b/core/client/controllers/feature.js @@ -25,10 +25,6 @@ var FeatureController = Ember.Controller.extend(Ember.PromiseProxyMixin, { return value; }), - tagsUI: Ember.computed('config.tagsUI', 'labs.tagsUI', function () { - return this.get('config.tagsUI') || this.get('labs.tagsUI'); - }), - codeInjectionUI: Ember.computed('config.codeInjectionUI', 'labs.codeInjectionUI', function () { return this.get('config.codeInjectionUI') || this.get('labs.codeInjectionUI'); }) diff --git a/core/client/controllers/settings.js b/core/client/controllers/settings.js index 090251c267..d60fd784fe 100644 --- a/core/client/controllers/settings.js +++ b/core/client/controllers/settings.js @@ -7,8 +7,8 @@ var SettingsController = Ember.Controller.extend({ showUsers: Ember.computed('session.user.name', function () { return this.get('session.user.isAuthor') ? false : true; }), - showTags: Ember.computed('session.user.name', 'controllers.feature.tagsUI', function () { - return this.get('session.user.isAuthor') || !this.get('controllers.feature.tagsUI') ? false : true; + showTags: Ember.computed('session.user.name', function () { + return this.get('session.user.isAuthor') ? false : true; }), showCodeInjection: Ember.computed('session.user.name', 'controllers.feature.codeInjectionUI', function () { return this.get('session.user.isAuthor') || this.get('session.user.isEditor') || !this.get('controllers.feature.codeInjectionUI') ? false : true; diff --git a/core/client/controllers/settings/labs.js b/core/client/controllers/settings/labs.js index 531d91d01c..f3c7e8023c 100644 --- a/core/client/controllers/settings/labs.js +++ b/core/client/controllers/settings/labs.js @@ -22,20 +22,9 @@ var LabsController = Ember.Controller.extend(Ember.Evented, { }); }, - tagsUIFlag: Ember.computed.alias('config.tagsUI'), codeUIFlag: Ember.computed.alias('config.codeInjectionUI'), - useTagsUI: Ember.computed('controllers.feature.tagsUI', function (key, value) { - // setter - if (arguments.length > 1) { - this.saveLabs('tagsUI', value); - } - - // getter - return this.get('controllers.feature.tagsUI') || false; - }), - - useCodeInjectionUI: Ember.computed('controllers.feature.tagsUI', function (key, value) { + useCodeInjectionUI: Ember.computed('controllers.feature.codeInjectionUI', function (key, value) { // setter if (arguments.length > 1) { this.saveLabs('codeInjectionUI', value); diff --git a/core/client/routes/settings/tags.js b/core/client/routes/settings/tags.js index d51502f475..862d043782 100644 --- a/core/client/routes/settings/tags.js +++ b/core/client/routes/settings/tags.js @@ -21,23 +21,8 @@ TagsRoute = AuthenticatedRoute.extend(CurrentUserSettings, PaginationRouteMixin, titleToken: 'Tags', beforeModel: function () { - var feature = this.controllerFor('feature'), - self = this; - - if (!feature) { - this.generateController('feature'); - feature = this.controllerFor('feature'); - } - return this.currentUser() - .then(this.transitionAuthor()) - .then(function () { - return feature.then(function () { - if (!feature.get('tagsUI')) { - return self.transitionTo('settings.general'); - } - }); - }); + .then(this.transitionAuthor()); }, model: function () { diff --git a/core/client/templates/settings/labs.hbs b/core/client/templates/settings/labs.hbs index bd72e08d41..e234a8977b 100644 --- a/core/client/templates/settings/labs.hbs +++ b/core/client/templates/settings/labs.hbs @@ -47,18 +47,6 @@