diff options
author | Rogelio Mita <rogeliomita@activitycentral.com> | 2013-10-03 23:41:55 (GMT) |
---|---|---|
committer | Rogelio Mita <rogeliomita@activitycentral.com> | 2013-10-03 23:41:55 (GMT) |
commit | 8d2942d652d614615d7eff6be5caad2767755082 (patch) | |
tree | 1caee338b79da78867cbeeee686fe1b4a541ac1b | |
parent | d1307cc527dfc509f9989128cf22d3cc5a1265b1 (diff) |
Merge similar loops
-rw-r--r-- | webapp/polls/views.py | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/webapp/polls/views.py b/webapp/polls/views.py index 05adaae..684a58f 100644 --- a/webapp/polls/views.py +++ b/webapp/polls/views.py @@ -358,11 +358,13 @@ class UnploadPollResultFormView(TemplateView): def post(self, request, *args, **kwargs): # pylint: disable=W0613 context = self.get_context_data() + user = request.user files = dict(request.FILES.lists()).get('result', []) to_json = [] existing = [] + not_authored_by_user = [] news = [] # Comprueba que los archvos .poll_result sean archivos validos @@ -371,8 +373,12 @@ class UnploadPollResultFormView(TemplateView): try: prf = PollResultFile(file_.temporary_file_path()) to_json.append(prf.get_data()) - exists = prf.exists() - existing.append(file_.name) if exists else news.append(file_) + if prf.exists(): + existing.append(file_.name) + elif not prf.is_authored_by(user): + not_authored_by_user.append(file_.name) + else: + news.append(file_) except ValueError: fname = file_.name msg = u'{0}: No es un .poll_result válido.'.format(fname) @@ -383,14 +389,6 @@ class UnploadPollResultFormView(TemplateView): publicados: %s y no serán procesados.' % (", ".join(existing)) messages.add_message(self.request, messages.INFO, msg) - not_authored_by_user = [] - for file_ in news: - user = request.user - prf = PollResultFile(file_.temporary_file_path()) - authored_by_user = prf.is_authored_by(user) - if authored_by_user is False: - not_authored_by_user.append(file_.name) - if len(not_authored_by_user): msg = u'El sistema cree que estos archivos no pertencen a una \ encuesta realizada por usted: {0}'.format( |