From 3471499613120b91d7e8dc488ed1bab6bd57fe8a Mon Sep 17 00:00:00 2001
From: James Kiesel <james.kiesel@gmail.com>
Date: Fri, 12 Aug 2016 15:51:09 -0400
Subject: [PATCH] Tighten up tags intersection page

---
 .../discourse/controllers/tags-show.js.es6         |  3 ++-
 .../javascripts/discourse/routes/tags-show.js.es6  | 14 +++++++++-----
 .../javascripts/discourse/templates/tags/show.hbs  | 10 ++++++++--
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js.es6 b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
index 34c4729228f..809c0623e86 100644
--- a/app/assets/javascripts/discourse/controllers/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tags-show.js.es6
@@ -43,6 +43,7 @@ export default Ember.Controller.extend(BulkTopicSelection, {
   needs: ["application"],
 
   tag: null,
+  secondaryTag: null,
   list: null,
   canAdminTag: Ember.computed.alias("currentUser.staff"),
   filterMode: null,
@@ -72,7 +73,7 @@ export default Ember.Controller.extend(BulkTopicSelection, {
   }.property(),
 
   showAdminControls: function() {
-    return this.get('canAdminTag') && !this.get('category');
+    return !this.get('secondaryTag') && this.get('canAdminTag') && !this.get('category');
   }.property('canAdminTag', 'category'),
 
   loadMoreTopics() {
diff --git a/app/assets/javascripts/discourse/routes/tags-show.js.es6 b/app/assets/javascripts/discourse/routes/tags-show.js.es6
index 961e28b80a6..69b2007c89b 100644
--- a/app/assets/javascripts/discourse/routes/tags-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/tags-show.js.es6
@@ -12,9 +12,12 @@ export default Discourse.Route.extend({
 
   model(params) {
     var tag = this.store.createRecord("tag", { id: Handlebars.Utils.escapeExpression(params.tag_id) }),
+        secondaryTag = null,
         f = '';
 
-    this.set("secondaryTagId", params.secondary_tag_id)
+    if (params.secondary_tag_id) {
+      this.set("secondaryTag", this.store.createRecord("tag", { id: Handlebars.Utils.escapeExpression(params.secondary_tag_id) }))
+    }
 
     if (params.category) {
       f = 'c/';
@@ -45,10 +48,10 @@ export default Discourse.Route.extend({
     const params = controller.getProperties('order', 'ascending');
 
     const categorySlug = this.get('categorySlug');
-    const secondaryTagId = this.get('secondaryTagId')
     const parentCategorySlug = this.get('parentCategorySlug');
     const filter = this.get('navMode');
     const tag_id = (tag ? tag.id : 'none');
+    const secondary_tag_id = this.get('secondaryTag.id')
 
     if (categorySlug) {
       var category = Discourse.Category.findBySlug(categorySlug, parentCategorySlug);
@@ -59,8 +62,8 @@ export default Discourse.Route.extend({
       }
 
       this.set('category', category);
-    } else if (secondaryTagId) {
-      params.filter = `tags/intersection/${tag_id}/${secondaryTagId}`;
+    } else if (secondary_tag_id) {
+      params.filter = `tags/intersection/${tag_id}/${secondary_tag_id}`;
       this.set('category', null);
     } else {
       params.filter = `tags/${tag_id}/l/${filter}`;
@@ -100,6 +103,7 @@ export default Discourse.Route.extend({
     this.controllerFor('tags.show').setProperties({
       model,
       tag: model,
+      secondaryTag: this.get('secondaryTag'),
       category: this.get('category'),
       filterMode: this.get('filterMode'),
       navMode: this.get('navMode'),
@@ -129,7 +133,7 @@ export default Discourse.Route.extend({
         // Pre-fill the tags input field
         if (controller.get('model.id')) {
           var c = self.controllerFor('composer').get('model');
-          c.set('tags', [controller.get('model.id')]);
+          c.set('tags', _.compact([controller.get('model.id'), controller.get('secondaryTag.id')]));
         }
       });
     },
diff --git a/app/assets/javascripts/discourse/templates/tags/show.hbs b/app/assets/javascripts/discourse/templates/tags/show.hbs
index db3ecce1e43..ef54c1a1b88 100644
--- a/app/assets/javascripts/discourse/templates/tags/show.hbs
+++ b/app/assets/javascripts/discourse/templates/tags/show.hbs
@@ -5,8 +5,10 @@
 <div class="list-controls">
   <div class="container">
     {{#if tagNotification}}
-      {{tag-notifications-button action="changeTagNotification"
-                                 notificationLevel=tagNotification.notification_level}}
+      {{#unless secondaryTag}}
+        {{tag-notifications-button action="changeTagNotification"
+                                   notificationLevel=tagNotification.notification_level}}
+      {{/unless}}
     {{/if}}
 
     {{#if showAdminControls}}
@@ -31,6 +33,10 @@
         {{#link-to 'tags'}}{{i18n "tagging.tags"}}{{/link-to}}
         {{fa-icon "angle-right"}}
         {{discourse-tag-bound tagRecord=tag style="simple"}}
+        {{#if secondaryTag}}
+          <span>&</span>
+          {{discourse-tag-bound tagRecord=secondaryTag style="simple"}}
+        {{/if}}
       </h2>
     {{/if}}
   </div>