py_tasks_melange: comparison app/soc/views/user/profile.py

equal deleted inserted replaced

-:6e44a4478ece
+:d2e61a490969
 # 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 User role.
+"""Views for editing and examining User profiles.
 """
 __authors__ = [
 '"Pawel Solyga" <pawel.solyga@gmail.com>',
 ]
 from google.appengine.api import users
 from django import http
 from django import shortcuts
 from django import newforms as forms
+from soc.logic.site import id_user
 from soc.views.helpers import forms_helpers
 from soc.views.helpers import response_helpers
 import soc.models.user
 class UserForm(forms_helpers.DbModelForm):
 """Django form displayed when creating or editing a User.
 """
 LINKNAME_PATTERN = r'''(?x)
 |         # -OR-
 _[0-9a-z] # underscore and ASCII digit or lowercase
 )*        # zero or more of OR group
 $'''
 LINKNAME_REGEX = re.compile(LINKNAME_PATTERN)
 class Meta:
 """Inner Meta class that defines some behavior for the form.
 """
 #: db.Model subclass for which the form will gather information
 #: list of model fields which will *not* be gathered by the form
 exclude = ['id']
 def clean_link_name(self):
 linkname = self.cleaned_data.get('link_name')
-linkname_user = soc.models.user.User.getUserForLinkname(linkname)
+linkname_user = id_user.getUserFromLinkName(linkname)
-current_id = users.get_current_user()
+id = users.get_current_user()
 # if linkname exist in datastore and doesn't belong to current user
-if linkname_user and (linkname_user.id != current_id):
+if linkname_user and (linkname_user.id != id):
 raise forms.ValidationError("This link name is already in use.")
 elif not self.LINKNAME_REGEX.match(linkname):
 raise forms.ValidationError("This link name is in wrong format.")
 return linkname
 if not current_id and not linkname:
 return http.HttpResponseRedirect(users.create_login_url(request.path))
 elif not current_id and linkname:
 return public(request, linkname)
-user = soc.models.user.User.getUserForId(current_id)
+user = id_user.getUserFromId(current_id)
 #: Show custom 404 page when linkname doesn't exist in datastore
 #: or show public view for linkname user
 if linkname:
-linkname_user = soc.models.user.User.getUserForLinkname(linkname)
+linkname_user = id_user.getUserFromLinkName(linkname)
 if not linkname_user:
 return http.HttpResponseNotFound('No user exists with that link name "%s"' %
 linkname)
 elif linkname_user and (linkname_user.id != current_id):
 return public(request, linkname)
 #: GET method
 if (request.method != 'POST') and user:
 form = UserForm(initial={'nick_name': user.nick_name,
 'link_name': user.link_name})
 return response_helpers.respond(request,
 template, {'template': template,
-'form': form,
+'form': form})
-'user': user})
 #: POST method
 form = UserForm()
 if request.method == 'POST':
 form = UserForm(request.POST)
 if form.is_valid():
 linkname = form.cleaned_data.get('link_name')
 nickname = form.cleaned_data.get("nick_name")
 if not user:
-user = soc.models.user.User(id = user,link_name = linkname,
+user = soc.models.user.User(id=id,link_name=linkname,
-nick_name = nickname)
+nick_name=nickname)
 else:
 user.nick_name = nickname
 user.link_name = linkname
 user.put()
 return response_helpers.respond(request,
 template, {'template': template,
 'form': form,
-'user': user,
 'submit_message': 'Profile saved.'})
 return response_helpers.respond(request,
 template, {'template': template, 'form': form})
 A subclass of django.http.HttpResponse with generated template.
 """
 #: If linkname is empty or not a valid linkname on the site, display
 #: "user does not exist", otherwise render public view for linkname user
 if linkname:
-linkname_user = soc.models.user.User.getUserForLinkname(linkname)
+linkname_user = id_user.getUserFromLinkName(linkname)
 if not linkname_user:
 return http.HttpResponseNotFound('No user exists with that link name "%s"' %
 linkname)
 else:
 return response_helpers.respond(request,
 template, {'template': template,
 'user': linkname_user})
 return http.HttpResponseNotFound('No user exists with that link name "%s"' %
 linkname)

changeset 118	d2e61a490969
parent 99	8c38b546a3cf
child 124	051afb721c22