Download as
Browse Code »

Commit 4eb4f872143d6e192d1cdf6d4f249a7966f21c42

Authored by sergiocampos
1 parent a8259b1e
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Corrigindo problema na view do perfil do usuario nao cadastrado 


git-svn-id: http://repositorio.interlegis.gov.br/colab/trunk@5534 bee1b3ed-c3eb-0310-9994-b88e04532788
Showing 2 changed files with 7 additions and 2 deletions   Show diff stats
colab/super_archives/templatetags/form_field.py
  Diff comments   View file @4eb4f87
@@ -38,7 +38,7 @@ class RenderFormField(template.Node): @@ -38,7 +38,7 @@ class RenderFormField(template.Node):
38 try: 38 try:
39 default_value = self.default_value_nocontext.resolve(context) 39 default_value = self.default_value_nocontext.resolve(context)
40 except template.VariableDoesNotExist: 40 except template.VariableDoesNotExist:
41 - pass 41 + default_value = ''
42 42
43 if editable: 43 if editable:
44 form_field_tag = '<br/>' + str(form_field) 44 form_field_tag = '<br/>' + str(form_field)
colab/views.py
  Diff comments   View file @4eb4f87
@@ -104,8 +104,13 @@ def user_profile(request, user, email_address=None, editable=False, form=None): @@ -104,8 +104,13 @@ def user_profile(request, user, email_address=None, editable=False, form=None):
104 emails = Message.objects.raw(query) 104 emails = Message.objects.raw(query)
105 n_sent = Message.objects.filter(from_address__in=email_addresses).count() 105 n_sent = Message.objects.filter(from_address__in=email_addresses).count()
106 106
  107 + if user:
  108 + profile = user.profile
  109 + else:
  110 + profile = None
  111 +
107 template_data = { 112 template_data = {
108 - 'user_profile': user.profile or None, 113 + 'user_profile': profile,
109 'email_address': email_address, 114 'email_address': email_address,
110 'emails': emails or [], 115 'emails': emails or [],
111 'form': form, 116 'form': form,