Handle dialogue group states with no assigned group better

praekeltfoundation · May 12, 2014 · 78639b6 · 78639b6
1 parent c774d13
commit 78639b6
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/go/base/static/js/src/apps/dialogue/states/group.js b/go/base/static/js/src/apps/dialogue/states/group.js
@@ -22,9 +22,12 @@
         e.preventDefault();
         var key = $(e.target).val();
 
-        if (key !== "none") {
+        if (key === 'unassigned') {
+          this.model.set('group', null, {silent: true});
+        } else if (key !== 'none') {
           this.model.set('group', {key: key}, {silent: true});
         }
+
       }
     }, DialogueStateEditView.prototype.events)
   });

diff --git a/go/base/static/js/test/apps/dialogue/states/group.test.js b/go/base/static/js/test/apps/dialogue/states/group.test.js
@@ -37,6 +37,9 @@ describe("go.apps.dialogue.states.group", function() {
       });
 
       it("should not try change the state's group", function() {
+        diagram.model.set('groups', []);
+        state.edit();
+
         assert.equal(
           state.model.get('group').get('key'),
           'group1');
@@ -68,6 +71,21 @@ describe("go.apps.dialogue.states.group", function() {
           'group2');
       });
     });
+
+    describe("when the current group is unassigned", function() {
+      it("should update the state's model", function() {
+        assert.equal(
+          state.model.get('group').get('key'),
+          'group1');
+
+        editMode
+          .$('.contact-group')
+          .val('unassigned')
+          .change();
+
+        assert.isNull(state.model.get('group'));
+      });
+    });
   });
 
   describe(".GroupStatePreviewView", function() {

diff --git a/go/base/static/templates/apps/dialogue/states/group/edit.jst b/go/base/static/templates/apps/dialogue/states/group/edit.jst
@@ -3,9 +3,14 @@
 
   <select class="contact-group form-control">
     <% if (model.get('dialogue').get('groups').length) { %>
-    <option value="none" selected>(No group)</option>
+    <option value="unassigned">(No group)</option>
     <%   model.get('dialogue').get('groups').each(function(group) { %>
-    <option value="<%= group.get('key') %>"><%= group.get('name') %></option>
+    <option
+     value="<%= group.get('key') %>"
+    <%     if (group === model.get('group')) { %> 
+     selected
+    <%     } %>
+     ><%= group.get('name') %></option>
     <%   }); %>
     <% } else { %>
     <option value="none" selected>No groups available</option>