Merge lp:~rvb/maas/bug-1413030-1.7 into lp:maas/1.7

[Raphaël Badin]

Backport revision 3482: Also hide the labels when the fields themselves are hidden in the add_node HTML snippet.

[Raphaël Badin (rvb)]

review: Approve

[Adam Collard (adam-collard)]

review: Needs Fixing

=== modified file 'src/maasserver/templates/maasserver/snippets.html'
--- src/maasserver/templates/maasserver/snippets.html	2014-10-02 20:19:38 +0000
+++ src/maasserver/templates/maasserver/snippets.html	2015-01-21 16:39:27 +0000
@@ -7,6 +7,7 @@
   </p>
 </script>
 <script type="text/x-template" id="add-node">
+<<<<<<< TREE
   <p>
     <label for="id_hostname">Hostname
       <span class="form-optional">(optional)</span>
@@ -17,11 +18,17 @@
     </div>
   </p>
   <p>
-    <label for="id_osystem">OS</label>
+    <label
+      for="id_osystem"
+      class="{% if node_form.osystem.is_hidden %}hidden{% endif %}">
+    OS</label>
     {{ node_form.osystem }}
   </p>
   <p>
-    <label for="id_distro_series">Release</label>
+    <label
+      for="id_distro_series"
+      class="{% if node_form.distro_series.is_hidden %}hidden{% endif %}">
+    Release</label>
     {{ node_form.distro_series }}
   </p>
   <p class="license_key hidden">
 
=== added file 'src/maasserver/views/tests/test_snippets.py'
--- src/maasserver/views/tests/test_snippets.py	1970-01-01 00:00:00 +0000
+++ src/maasserver/views/tests/test_snippets.py	2015-01-21 16:39:27 +0000
@@ -0,0 +1,47 @@
+# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Test maasserver snippets."""
+
+from __future__ import (
+    absolute_import,
+    print_function,
+    unicode_literals,
+    )
+
+str = None
+
+__metaclass__ = type
+__all__ = []
+
+
+from django.core.urlresolvers import reverse
+from lxml.html import fromstring
+from maasserver.testing.testcase import MAASServerTestCase
+from testtools.matchers import (
+    HasLength,
+    Not,
+    )
+
+
+class SnippetsTest(MAASServerTestCase):
+
+    def test_index_page_containts_add_node_snippet(self):
+        self.client_log_in()
+        index_page = self.client.get(reverse('index'))
+        doc = fromstring(index_page.content)
+        self.assertEqual(
+            'text/x-template', doc.cssselect('#add-node')[0].attrib['type'])
+
+    def test_add_node_snippet_hides_osystem_distro_series_labels(self):
+        self.client_log_in()
+        index_page = self.client.get(reverse('index'))
+        doc = fromstring(index_page.content)
+        content_text = doc.cssselect('#add-node')[0].text_content()
+        add_node_snippet = fromstring(content_text)
+        self.expectThat(
+            add_node_snippet.cssselect("label[for=id_osystem].hidden"),
+            Not(HasLength(0)), "No hidden id_osystem label")
+        self.expectThat(
+            add_node_snippet.cssselect("label[for=id_distro_series].hidden"),
+            Not(HasLength(0)), "No hidden id_distro_series label")