Index: /branches/rel_avx_2_7_3/src/webui/webui/htdocs/new/src/avx/models/network/dns/__init__.py
===================================================================
--- /branches/rel_avx_2_7_3/src/webui/webui/htdocs/new/src/avx/models/network/dns/__init__.py	(revision 8911)
+++ /branches/rel_avx_2_7_3/src/webui/webui/htdocs/new/src/avx/models/network/dns/__init__.py	(working copy)
@@ -40,7 +40,7 @@
 
 class StaticDNSHostEntry(ANModel):
     hostname = CharField(verbose_name=_('Host Name'), primary_key=True, length='1..255')
-    ip = IPAddressField(verbose_name=_('IP'))
+    ip = IPAddressField(verbose_name=_('IP'), primary_key=True)
 
     class Clear(Action):
         verbose_name = _('Clear Static DNS Entry')
@@ -81,7 +81,11 @@
         def _delete(self, pk_list):
             self.cli.set_config()
             for each_pk in pk_list:
-                result = self.cli.cmd('no ip host "%s"' % each_pk['hostname'],
+                if 'ipv4' in each_pk['ip']:
+                    ip_data = each_pk['ip']['ipv4']
+                elif 'ipv6' in each_pk['ip']:
+                    ip_data = each_pk['ip']['ipv6']
+                result = self.cli.cmd('no ip host "%s" %s' % (each_pk['hostname'], ip_data),
                                   BlankParser(nonblank_exception=CLICmdError, supplement=True))
             mark_expire_all(self._model)
             return
Index: /branches/rel_avx_2_7_3/src/webui/webui/htdocs/new/src/client/app/modules/network/network.service.js
===================================================================
--- /branches/rel_avx_2_7_3/src/webui/webui/htdocs/new/src/client/app/modules/network/network.service.js	(revision 8911)
+++ /branches/rel_avx_2_7_3/src/webui/webui/htdocs/new/src/client/app/modules/network/network.service.js	(working copy)
@@ -473,7 +473,8 @@
                 var url = '/api/avx/network/dns/StaticDNSHostEntry/_delete';
                 var post_data = {
                     "pk": JSON.stringify({
-                        "hostname": data
+                        "hostname": data.hostname,
+                        "ip": data.ip
                     }),
                     "csrfmiddlewaretoken": csrf_id
                 };
@@ -489,4 +490,4 @@
                 return apiService.post(url, post_data);
             }
         }
-]);
\ No newline at end of file
+]);
Index: /branches/rel_avx_2_7_3/src/webui/webui/htdocs/new/src/client/app/modules/network/submenu/dns_server/static_dns/static_dns.controller.js
===================================================================
--- /branches/rel_avx_2_7_3/src/webui/webui/htdocs/new/src/client/app/modules/network/submenu/dns_server/static_dns/static_dns.controller.js	(revision 8911)
+++ /branches/rel_avx_2_7_3/src/webui/webui/htdocs/new/src/client/app/modules/network/submenu/dns_server/static_dns/static_dns.controller.js	(working copy)
@@ -52,12 +52,20 @@
                     }
                 });
             };
-            tableViewModel.delete = function(hostname) {
+            tableViewModel.delete = function(hostname, ip) {
                 var delete_reminder = confirm($filter('T')("Are you sure you want to delete the static DNS entry?"));
                 if (delete_reminder) {
                     tableViewModel.showProgressBar();
+                    var ip_data = {'ipv6':ip}
+                    if(ip.indexOf(".") > 0) {
+                        ip_data = {'ipv4':ip}
+                    }
+                    var data = {
+                        "hostname": hostname,
+                        "ip": ip_data
+                    }
                     netResourceService
-                        .delete_static_dns(hostname, tableViewModel.csrf_token)
+                        .delete_static_dns(data, tableViewModel.csrf_token)
                         .then(function(res) {
                             $rootScope.$broadcast('endLoading', true);
                             if (res && res.status === 200) {
@@ -91,4 +99,4 @@
 
             tableViewModel.showDnsServer();
         }
-    ]);
\ No newline at end of file
+    ]);
Index: /branches/rel_avx_2_7_3/src/webui/webui/htdocs/new/src/client/app/modules/network/submenu/dns_server/static_dns/static_dns.html
===================================================================
--- /branches/rel_avx_2_7_3/src/webui/webui/htdocs/new/src/client/app/modules/network/submenu/dns_server/static_dns/static_dns.html	(revision 8911)
+++ /branches/rel_avx_2_7_3/src/webui/webui/htdocs/new/src/client/app/modules/network/submenu/dns_server/static_dns/static_dns.html	(working copy)
@@ -36,7 +36,7 @@
                             <td>{{row.ip}}</td>
                             <td>
                                 <div class="btn-group">
-                                    <button ng-show="allow_config" title="{{'Delete'|T}}" class="btn btn-link" ng-click="staticDns.delete(row.hostname)"><i class="fa fa-times-circle"></i></button>
+                                    <button ng-show="allow_config" title="{{'Delete'|T}}" class="btn btn-link" ng-click="staticDns.delete(row.hostname, row.ip)"><i class="fa fa-times-circle"></i></button>
                                 </div>
                             </td>
                         </tr>
@@ -51,4 +51,4 @@
             </div>
         </rd-widget>
     </div>
-</div>
\ No newline at end of file
+</div>