Merge branch 'issue-253' into 'master'

Make it easy to add a cname to changed hostname

Closes #253

circle/network/templates/network/host-edit.html

@@ -23,7 +23,7 @@
     {% if rule_list.data.data.count > 0 %}
     {% if rule_list.data.data.count > 0 %}
       {% render_table rule_list %}
       {% render_table rule_list %}
     {% else %}
     {% else %}
-            {% trans "No rules associated with this host!" %}
+      {% trans "No rules associated with this host." %}
     {% endif %}
     {% endif %}
 
 
     <div class="page-header">
     <div class="page-header">
@@ -48,7 +48,7 @@
       <h3>{% trans "Add host group" %}</h3>
       <h3>{% trans "Add host group" %}</h3>
     </div>
     </div>
     {% if not_used_groups|length == 0 %}
     {% if not_used_groups|length == 0 %}
-      No more groups to add!
+      {% trans "No more groups to add" %}
     {% else %}
     {% else %}
       <form action="{% url "network.add_host_group" pk=host_pk %}" method="POST">
       <form action="{% url "network.add_host_group" pk=host_pk %}" method="POST">
         {% csrf_token %}
         {% csrf_token %}
@@ -65,15 +65,19 @@
       </form>
       </form>
     {% endif %}
     {% endif %}
     <div class="page-header">
     <div class="page-header">
+      <a href="{% url "network.record_create" %}?host={{ host_pk }}" 
+       class="btn btn-xs btn-success pull-right">
+        <i class="fa fa-plus-circle"></i>
+        {% trans "Add new CNAME record" %}
+      </a>
       <h3>{% trans "Records" %}</h3>
       <h3>{% trans "Records" %}</h3>
     </div>
     </div>
     {% render_table records_table %}
     {% render_table records_table %}
-
   </div><!-- col-sm-5 -->
   </div><!-- col-sm-5 -->
 </div><!-- row -->
 </div><!-- row -->
 
 
 {% endblock %}
 {% endblock %}
 
 
 {% block extra_etc %}
 {% block extra_etc %}
-<script src="{% static "js/host.js" %}"></script>
+  <script src="{% static "js/host.js" %}"></script>
 {% endblock %}
 {% endblock %}

circle/network/views.py

@@ -505,10 +505,23 @@ class RecordCreate(LoginRequiredMixin, SuperuserRequiredMixin,
     success_message = _(u'Successfully created record!')
     success_message = _(u'Successfully created record!')
 
 
     def get_initial(self):
     def get_initial(self):
-        return {
-            # 'owner': 1,
-            'domain': self.request.GET.get('domain'),
-        }
+        host_pk = self.request.GET.get("host")
+        try:
+            host = Host.objects.get(pk=host_pk)
+        except (Host.DoesNotExist, ValueError):
+            host = None
+
+        initial = {'owner': self.request.user}
+        if host:
+            initial.update({
+                'type': "CNAME",
+                'host': host,
+                'address': host.get_fqdn(),
+            })
+        else:
+            initial['domain'] = self.request.GET.get('domain')
+
+        return initial
 
 
 
 
 class RecordDelete(LoginRequiredMixin, SuperuserRequiredMixin, DeleteView):
 class RecordDelete(LoginRequiredMixin, SuperuserRequiredMixin, DeleteView):