From 009bfb2b4223d4b324ec8243b6bfbc45f4b33930 Mon Sep 17 00:00:00 2001 From: David Schmitz <schmitz@lrz.de> Date: Tue, 25 Sep 2018 11:45:51 +0000 Subject: [PATCH] new rule concept: work on ui edit for rules with multiple source prefixes --- flowspec/viewsets.py | 3 ++- poller/views.py | 8 ++++++++ templates/user_routes.html | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/flowspec/viewsets.py b/flowspec/viewsets.py index 7b4a878e..b55d7f1b 100644 --- a/flowspec/viewsets.py +++ b/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) diff --git a/poller/views.py b/poller/views.py index 282c8549..428f85cb 100644 --- a/poller/views.py +++ b/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): diff --git a/templates/user_routes.html b/templates/user_routes.html index 1b575914..67805771 100644 --- a/templates/user_routes.html +++ b/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 { -- GitLab