Changeset 665
- Timestamp:
- 09/22/05 17:26:56 (3 years ago)
- Files:
-
- django/trunk/django/contrib/comments/views/comments.py (modified) (4 diffs)
- django/trunk/django/contrib/comments/views/karma.py (modified) (2 diffs)
- django/trunk/django/contrib/comments/views/userflags.py (modified) (5 diffs)
- django/trunk/django/views/admin/doc.py (modified) (10 diffs)
- django/trunk/django/views/auth/login.py (modified) (3 diffs)
- django/trunk/django/views/registration/passwords.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/trunk/django/contrib/comments/views/comments.py
r661 r665 2 2 from django.core.mail import mail_admins, mail_managers 3 3 from django.core.exceptions import Http404, ObjectDoesNotExist 4 from django.core.extensions import DjangoContext, load_and_render4 from django.core.extensions import DjangoContext, render_to_response 5 5 from django.models.auth import users 6 6 from django.models.comments import comments, freecomments … … 228 228 comment = errors and '' or manipulator.get_comment(new_data) 229 229 comment_form = CommentFormWrapper(manipulator, new_data, errors, rating_choices) 230 return load_and_render('comments/preview', {230 return render_to_response('comments/preview', { 231 231 'comment': comment, 232 232 'comment_form': comment_form, … … 296 296 if errors or request.POST.has_key('preview'): 297 297 comment = errors and '' or manipulator.get_comment(new_data) 298 return load_and_render('comments/free_preview', {298 return render_to_response('comments/free_preview', { 299 299 'comment': comment, 300 300 'comment_form': formfields.FormWrapper(manipulator, new_data, errors), … … 333 333 except ObjectDoesNotExist: 334 334 pass 335 return load_and_render('comments/posted', {'object': obj}, context_instance=DjangoContext(request))335 return render_to_response('comments/posted', {'object': obj}, context_instance=DjangoContext(request)) django/trunk/django/contrib/comments/views/karma.py
r661 r665 1 1 from django.core.exceptions import Http404 2 from django.core.extensions import DjangoContext, load_and_render2 from django.core.extensions import DjangoContext, render_to_response 3 3 from django.models.comments import comments, karma 4 4 … … 26 26 # Reload comment to ensure we have up to date karma count 27 27 comment = comments.get_object(pk=comment_id) 28 return load_and_render('comments/karma_vote_accepted', {'comment': comment}, context_instance=DjangoContext(request))28 return render_to_response('comments/karma_vote_accepted', {'comment': comment}, context_instance=DjangoContext(request)) django/trunk/django/contrib/comments/views/userflags.py
r661 r665 1 from django.core.extensions import DjangoContext, load_and_render1 from django.core.extensions import DjangoContext, render_to_response 2 2 from django.core.exceptions import Http404 3 3 from django.models.comments import comments, moderatordeletions, userflags … … 22 22 userflags.flag(comment, request.user) 23 23 return HttpResponseRedirect('%sdone/' % request.path) 24 return load_and_render('comments/flag_verify', {'comment': comment}, context_instance=DjangoContext(request))24 return render_to_response('comments/flag_verify', {'comment': comment}, context_instance=DjangoContext(request)) 25 25 flag = login_required(flag) 26 26 … … 30 30 except comments.CommentDoesNotExist: 31 31 raise Http404 32 return load_and_render('comments/flag_done', {'comment': comment}, context_instance=DjangoContext(request))32 return render_to_response('comments/flag_done', {'comment': comment}, context_instance=DjangoContext(request)) 33 33 34 34 def delete(request, comment_id): … … 55 55 m.save() 56 56 return HttpResponseRedirect('%sdone/' % request.path) 57 return load_and_render('comments/delete_verify', {'comment': comment}, context_instance=DjangoContext(request))57 return render_to_response('comments/delete_verify', {'comment': comment}, context_instance=DjangoContext(request)) 58 58 delete = login_required(delete) 59 59 … … 63 63 except comments.CommentDoesNotExist: 64 64 raise Http404 65 return load_and_render('comments/delete_done', {'comment': comment}, context_instance=DjangoContext(request))65 return render_to_response('comments/delete_done', {'comment': comment}, context_instance=DjangoContext(request)) django/trunk/django/views/admin/doc.py
r660 r665 3 3 from django.conf import settings 4 4 from django.models.core import sites 5 from django.core.extensions import DjangoContext, load_and_render5 from django.core.extensions import DjangoContext, render_to_response 6 6 from django.core.exceptions import Http404, ViewDoesNotExist 7 7 from django.core import template, template_loader, defaulttags, defaultfilters, urlresolvers … … 18 18 if not doc: 19 19 return missing_docutils_page(request) 20 return load_and_render('doc/index', context_instance=DjangoContext(request))20 return render_to_response('doc/index', context_instance=DjangoContext(request)) 21 21 22 22 def bookmarklets(request): 23 return load_and_render('doc/bookmarklets', {23 return render_to_response('doc/bookmarklets', { 24 24 'admin_url' : "%s://%s" % (os.environ.get('HTTPS') == 'on' and 'https' or 'http', request.META['HTTP_HOST']), 25 25 }, context_instance=DjangoContext(request)) … … 60 60 template.registered_tags, template.registered_filters = saved_tagset 61 61 62 return load_and_render('doc/template_tag_index', {'tags': tags}, context_instance=DjangoContext(request))62 return render_to_response('doc/template_tag_index', {'tags': tags}, context_instance=DjangoContext(request)) 63 63 64 64 def template_filter_index(request): … … 92 92 template.registered_tags, template.registered_filters = saved_tagset 93 93 94 return load_and_render('doc/template_filter_index', {'filters': filters}, context_instance=DjangoContext(request))94 return render_to_response('doc/template_filter_index', {'filters': filters}, context_instance=DjangoContext(request)) 95 95 96 96 def view_index(request): … … 111 111 'url' : simplify_regex(regex), 112 112 }) 113 return load_and_render('doc/view_index', {'views': views}, context_instance=DjangoContext(request))113 return render_to_response('doc/view_index', {'views': views}, context_instance=DjangoContext(request)) 114 114 115 115 def view_detail(request, view): … … 129 129 for key in metadata: 130 130 metadata[key] = doc.parse_rst(metadata[key], 'model', 'view:' + view) 131 return load_and_render('doc/view_detail', {131 return render_to_response('doc/view_detail', { 132 132 'name': view, 133 133 'summary': title, … … 149 149 'class' : opts.module_name, 150 150 }) 151 return load_and_render('doc/model_index', {'models': models}, context_instance=DjangoContext(request))151 return render_to_response('doc/model_index', {'models': models}, context_instance=DjangoContext(request)) 152 152 153 153 def model_detail(request, model): … … 186 186 'verbose' : verbose, 187 187 }) 188 return load_and_render('doc/model_detail', {188 return render_to_response('doc/model_detail', { 189 189 'name': '%s.%s' % (opts.app_label, opts.module_name), 190 190 'summary': "Fields on %s objects" % opts.verbose_name, … … 206 206 'order' : list(settings_mod.TEMPLATE_DIRS).index(dir), 207 207 }) 208 return load_and_render('doc/template_detail', {208 return render_to_response('doc/template_detail', { 209 209 'name': template, 210 210 'templates': templates, … … 217 217 def missing_docutils_page(request): 218 218 """Display an error message for people without docutils""" 219 return load_and_render('doc/missing_docutils')219 return render_to_response('doc/missing_docutils') 220 220 221 221 def load_all_installed_template_libraries(): django/trunk/django/views/auth/login.py
r659 r665 1 1 from django.parts.auth.formfields import AuthenticationForm 2 2 from django.core import formfields, template_loader 3 from django.core.extensions import DjangoContext, load_and_render3 from django.core.extensions import DjangoContext, render_to_response 4 4 from django.models.auth import users 5 5 from django.models.core import sites … … 23 23 errors = {} 24 24 request.session.set_test_cookie() 25 return load_and_render('registration/login', {25 return render_to_response('registration/login', { 26 26 'form': formfields.FormWrapper(manipulator, request.POST, errors), 27 27 REDIRECT_FIELD_NAME: redirect_to, … … 34 34 del request.session[users.SESSION_KEY] 35 35 except KeyError: 36 return load_and_render('registration/logged_out', context_instance=DjangoContext(request))36 return render_to_response('registration/logged_out', context_instance=DjangoContext(request)) 37 37 else: 38 38 # Redirect to this page until the session has been cleared. django/trunk/django/views/registration/passwords.py
r658 r665 1 1 from django.core import formfields, template_loader, validators 2 from django.core.extensions import DjangoContext, load_and_render2 from django.core.extensions import DjangoContext, render_to_response 3 3 from django.models.auth import users 4 4 from django.views.decorators.auth import login_required … … 77 77 form.save() 78 78 return HttpResponseRedirect('%sdone/' % request.path) 79 return load_and_render('registration/password_reset_form', {'form': formfields.FormWrapper(form, new_data, errors)},79 return render_to_response('registration/password_reset_form', {'form': formfields.FormWrapper(form, new_data, errors)}, 80 80 context_instance=DjangoContext(request)) 81 81 82 82 def password_reset_done(request): 83 return load_and_render('registration/password_reset_done', context_instance=DjangoContext(request))83 return render_to_response('registration/password_reset_done', context_instance=DjangoContext(request)) 84 84 85 85 def password_change(request): … … 92 92 form.save(new_data) 93 93 return HttpResponseRedirect('%sdone/' % request.path) 94 return load_and_render('registration/password_change_form', {'form': formfields.FormWrapper(form, new_data, errors)},94 return render_to_response('registration/password_change_form', {'form': formfields.FormWrapper(form, new_data, errors)}, 95 95 context_instance=DjangoContext(request)) 96 96 password_change = login_required(password_change) 97 97 98 98 def password_change_done(request): 99 return load_and_render('registration/password_change_done', context_instance=DjangoContext(request))99 return render_to_response('registration/password_change_done', context_instance=DjangoContext(request))
