# HG changeset patch # User Todd Larsen # Date 1219190911 0 # Node ID 7ccc026f579341363335c7df19ba28c22e342061 # Parent fd34dd071e5e167b96fc71914c9d4ba343ea3a42 Clean up some deletions from previous rearranging that did not get committed. diff -r fd34dd071e5e -r 7ccc026f5793 app/soc/templates/soc/user/profile.html --- a/app/soc/templates/soc/user/profile.html Wed Aug 20 00:04:42 2008 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -{% extends "soc/base.html" %} -{% comment %} -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -{% endcomment %} -{% load forms_helpers %} -{% block page_title %}User Profile{% endblock %} -{% block header_title %}User Profile{% endblock %} -{% block body %} -

-

-{% block instructions %} -Please use this form to set basic site-wide settings for your participation in Google Open Source Programs. -{% endblock %} -

-
- - {% field_as_table_row form.nick_name %} - {% field_as_table_row form.link_name %} -
-
- - -
-
-

-{% endblock %} \ No newline at end of file diff -r fd34dd071e5e -r 7ccc026f5793 app/soc/views/person.py --- a/app/soc/views/person.py Wed Aug 20 00:04:42 2008 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,71 +0,0 @@ -#!/usr/bin/python2.5 -# -# Copyright 2008 the Melange authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""Views relevant to the Person role. -""" - -__authors__ = [ - '"Augie Fackler" ', - ] - - -from google.appengine.api import users -from django import http -from django import shortcuts -from django import newforms as forms - -from soc.models import person -from soc.views.helpers import forms_helpers - - -class ProfileForm(forms_helpers.DbModelForm): - """Django form displayed when creating or editing a Person. - """ - - class Meta: - """Inner Meta class that defines some behavior for the form. - """ - #: db.Model subclass for which the form will gather information - model = person.Person - - #: list of model fields which will *not* be gathered by the form - exclude = ['user'] - - -def profile(request, template='soc/person/profile.html'): - """View for a Person to modify the properties of a PersonModel. - - Args: - request: the standard django request object. - template: the template path to use for rendering the template. - - Returns: - A subclass of django.http.HttpResponse which either contains the form to - be filled out, or a redirect to the correct view in the interface. - """ - user = users.get_current_user() - if not user: - return http.HttpResponseRedirect(users.create_login_url(request.path)) - - form = ProfileForm() - if request.method=='POST': - form = ProfileForm(request.POST) - - if not form.errors: - return http.HttpResponse('This would update the model') - - return shortcuts.render_to_response( - template, dictionary={'template': template, 'form': form, 'user': user})