From 9661aacdee83069dc3e24ca692eac31ea0c012c4 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Thu, 7 May 2015 09:20:19 +0930
Subject: [PATCH] Fix moving discussions from uncategorized

---
 .../tags/js/src/components/move-discussion-modal.js |  5 +++--
 extensions/tags/js/src/helpers/category-label.js    | 13 +++++++++++--
 extensions/tags/less/categories.less                |  5 +++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/extensions/tags/js/src/components/move-discussion-modal.js b/extensions/tags/js/src/components/move-discussion-modal.js
index f83ff5336..96f35ef95 100644
--- a/extensions/tags/js/src/components/move-discussion-modal.js
+++ b/extensions/tags/js/src/components/move-discussion-modal.js
@@ -12,17 +12,18 @@ export default class MoveDiscussionModal extends Component {
 
   view() {
     var discussion = this.props.discussion;
+    var discussionCategory = discussion && discussion.category();
 
     return m('div.modal-dialog.modal-move-discussion', [
       m('div.modal-content', [
         m('button.btn.btn-icon.btn-link.close.back-control', {onclick: app.modal.close.bind(app.modal)}, icon('times')),
         m('div.modal-header', m('h3.title-control', discussion
-          ? ['Move ', m('em', discussion.title()), ' from ', categoryLabel(discussion.category()), ' to...']
+          ? ['Move ', m('em', discussion.title()), ' from ', categoryLabel(discussionCategory), ' to...']
           : ['Start a Discussion In...'])),
         m('div', [
           m('ul.category-list', [
             this.categories().map(category =>
-              (discussion && category.id() === discussion.category().id()) ? '' : m('li.category-tile', {style: 'background-color: '+category.color()}, [
+              (discussion && discussionCategory && category.id() === discussionCategory.id()) ? '' : m('li.category-tile', {style: 'background-color: '+category.color()}, [
                 m('a[href=javascript:;]', {onclick: this.save.bind(this, category)}, [
                   m('h3.title', category.title()),
                   m('p.description', category.description()),
diff --git a/extensions/tags/js/src/helpers/category-label.js b/extensions/tags/js/src/helpers/category-label.js
index 73f8ad398..3128136be 100644
--- a/extensions/tags/js/src/helpers/category-label.js
+++ b/extensions/tags/js/src/helpers/category-label.js
@@ -1,3 +1,12 @@
-export default function categoryLabel(category) {
-  return m('span.category-label', {style: {backgroundColor: category.color()}}, category.title());
+export default function categoryLabel(category, attrs) {
+  attrs = attrs || {};
+
+  if (category) {
+    attrs.style = attrs.style || {};
+    attrs.style.backgroundColor = category.color();
+  } else {
+    attrs.className = (attrs.className || '')+' uncategorized';
+  }
+
+  return m('span.category-label', attrs, category ? category.title() : 'Uncategorized');
 }
diff --git a/extensions/tags/less/categories.less b/extensions/tags/less/categories.less
index 9a40a5d02..fcc1359ab 100644
--- a/extensions/tags/less/categories.less
+++ b/extensions/tags/less/categories.less
@@ -7,6 +7,11 @@
   padding: 1px 5px;
   border-radius: 4px;
 
+  &.uncategorized {
+    border: 1px dotted @fl-body-muted-color;
+    color: @fl-body-muted-color;
+  }
+
   .discussion-summary & {
     margin-right: 5px;
     font-size: 11px;