@@ -1 +1 @@ -0.1 +0.2 VERSION @@ -29,28 +29,20 @@ class DoubanAccount(db.Model): return new_account @classmethod - def get_authenticated_accounts(cls, user): + def get_authenticated_accounts(cls, user, douban_id=None): """ 显示最近创建的已授权的帐户 """ query = cls.all() \ .filter('user = ', user) \ .filter('request_key = ', 'ALREADY_AUTHENTICATED') \ - .order('-created') \ - .fetch(settings.MAX_STORED_ACCOUNTS) - return query + .order('-created') + if douban_id is None: + return query.fetch(settings.MAX_STORED_ACCOUNTS) + else: + return query.filter('douban_id = ', douban_id).get() def get_douban_profile(self): - """ 获取相应的豆瓣用户档案 - 如果超过了缓存的有效时限，更新档案 - - """ - profile = DoubanProfile.get_by_douban_id(self.douban_id) - if profile.need_update(): - service = douban_service() - # GData 不太支持 Unicode - entry = service.GetPeople('/people/%s' % \ - self.douban_id.encode('utf-8')) - profile.update(entry) - return profile + """ 获取相应的豆瓣用户档案 """ + return DoubanProfile.get_by_douban_id(self.douban_id) douban_profile = property(get_douban_profile) def set_request_key(self, key, secret): @@ -110,8 +102,19 @@ class DoubanProfile(db.Model): @classmethod def get_by_douban_id(cls, douban_id): - """ 按豆瓣 ID 获取用户档案 """ - return cls.all().filter('douban_id = ', douban_id).get() + """ + 按豆瓣 ID 获取用户档案 + 如果超过了缓存的有效时限，更新档案 + + """ + profile = cls.all().filter('douban_id = ', douban_id).get() + if profile and profile.need_update(): + service = douban_service() + # GData 不太支持 Unicode + entry = service.GetPeople('/people/%s' % \ + douban_id.encode('utf-8')) + profile.update(entry) + return profile @classmethod def insert_or_update(cls, people_entry): authdouban/models.py @@ -1,8 +1,9 @@ {% extends 'base.html' %} -{% block delete_account %} +{% block main %} <div class="delete-account"> + {% if douban_account %} <div class="title"> <h3>你确定要注销这个豆瓣帐号的授权吗？</h3> </div> @@ -19,5 +20,11 @@ </div> </form> </div> + {% else %} + <div class="title last"> + <h3>没找到豆瓣 ID 为 {{ douban_id }} 的已授权帐户</h3> + </div> + {% endif %} + </div> {% endblock %} authdouban/templates/authdouban/delete_account.html @@ -19,7 +19,7 @@ {% block douban_user_delete %} {% if douban_account %} <div class="douban-user-delete"> - <a href="/account/douban/delete/{{ douban_account.key }}/" class="douban-user-delete">删除帐号</a> + <a href="/account/douban/delete/{{ douban_account.douban_id }}/" class="douban-user-delete">删除帐号</a> </div> {% endif %} {% endblock %} authdouban/templates/authdouban/douban_user.html @@ -1,6 +1,6 @@ {% extends 'base.html' %} -{% block list_account %} +{% block main %} <div class="account-list"> {% if not douban_accounts %} <div class="no-account"> authdouban/templates/authdouban/list_account.html @@ -96,12 +96,17 @@ class DeleteAccount(webapp.RequestHandler): 删除已授权帐户 """ - def get(self, key, template_name='templates/authdouban/delete_account.html'): + def get(self, douban_id, template_name='templates/authdouban/delete_account.html'): + user = users.get_current_user() + account = DoubanAccount.get_authenticated_accounts(user, douban_id) context = { - 'douban_account': DoubanAccount.get(key), + 'douban_id': douban_id, + 'douban_account': account, } return render_to_response(self, template_name, context) - def post(self, key): - DoubanAccount.get(key).delete() + def post(self, douban_id): + user = users.get_current_user() + account = DoubanAccount.get_authenticated_accounts(user, douban_id) + account.delete() return self.redirect('/account/douban/') authdouban/views.py a5df957e8778d3dfb3d69db060d3efd008683060 wu yuntao wyt.py@thonic.org http://github.com/wuyuntao/appengine-authdouban/commit/44f373c8025bd8486dc5e6779fa9be3c1b6f3813 44f373c8025bd8486dc5e6779fa9be3c1b6f3813 2009-03-03T04:23:54-08:00 2009-03-03T04:23:54-08:00 Delete accounts by douban id instead of account key. d6aba5a9b16c0e7501817c42e57e6c8fb3d24b0d wu yuntao wyt.py@thonic.org