new rule concept: work on ui edit for rules with multiple source prefixes

flowspec/viewsets.py

@@ -388,7 +388,8 @@ class MatchDscpViewSet(viewsets.ModelViewSet):
 
 # class1's attribute 'id' should be existing and by primary key
 def convert_container_to_queryset(list1, class1):
-         temp1_ids = [obj.id for obj in list1]
+         #temp1_ids = [obj.id for obj in list1]
+         temp1_ids = [obj.id for obj in list1 if obj != None]
          temp2_ids = set(temp1_ids)
          return class1.objects.filter(id__in=temp2_ids)
 

poller/views.py

@@ -127,6 +127,7 @@ class Msgs(object):
         return json_response(msg)
 
     def message_updates(self, request, peer_id):
+        logger.info("poller::views::Msgs::message_updates(): called peer_id="+str(peer_id))
         if request.is_ajax():
             cursor = {}
             try:
@@ -144,16 +145,23 @@ class Msgs(object):
                     self.user_cache[user] = []
             except:
                 self.user_cache[user] = []
+
+            logger.info("poller::views::Msgs::message_updates(): before test on waiting peer_id="+str(peer_id))
             if not self.user_cache[user] or cursor[user] == self.user_cache[user][-1]['id']:
+                logger.info("poller::views::Msgs::message_updates(): before waiting peer_id="+str(peer_id))
                 self.new_message_user_event[user].wait(settings.POLL_SESSION_UPDATE)
+            logger.info("poller::views::Msgs::message_updates(): after test on waiting peer_id="+str(peer_id))
             try:
                 for index, m in enumerate(self.user_cache[user]):
                     if m['id'] == cursor[user]:
+                        logger.info("poller::views::Msgs::message_updates(): peer_id="+str(peer_id)+" before return in loop inner")
                         return json_response({'messages': self.user_cache[user][index + 1:]})
+                logger.info("poller::views::Msgs::message_updates(): peer_id="+str(peer_id)+" before return in loop")
                 return json_response({'messages': self.user_cache[user]})
             finally:
                 if self.user_cache[user]:
                     self.user_cursor[user] = self.user_cache[user][-1]['id']
+        logger.info("poller::views::Msgs::message_updates(): peer_id="+str(peer_id)+" before return end")
         return HttpResponseRedirect(reverse('group-routes'))
 
     def monitor_polls(self):

templates/user_routes.html

@@ -408,7 +408,7 @@ var update_size = function() {
 a { 
   word-wrap: break-word;
   display: block;
-  width: 200px; 
+  max-width: 200px; 
 }
 
 .dl-horizontal dt {