diff options
| -rw-r--r-- | askbot/deps/django_authopenid/urls.py | 5 | ||||
| -rw-r--r-- | askbot/deps/django_authopenid/views.py | 49 | ||||
| -rw-r--r-- | askbot/models/question.py | 4 | ||||
| -rw-r--r-- | askbot/skins/common/media/js/utils.js | 2 | ||||
| -rw-r--r-- | askbot/skins/default/media/style/style.less | 1 | ||||
| -rw-r--r-- | askbot/tests/badge_tests.py | 2 |
6 files changed, 6 insertions, 57 deletions
diff --git a/askbot/deps/django_authopenid/urls.py b/askbot/deps/django_authopenid/urls.py index 8c0c75b4..1b7d0b01 100644 --- a/askbot/deps/django_authopenid/urls.py +++ b/askbot/deps/django_authopenid/urls.py @@ -21,11 +21,6 @@ urlpatterns = patterns('askbot.deps.django_authopenid.views', ), url(r'^%s$' % _('register/'), 'register', name='user_register'), url( - r'^%s$' % _('verify-user-information/'), - 'verify_user_information', - name = 'verify_user_information' - ), - url( r'^%s$' % _('signup/'), 'signup_with_password', name='user_signup_with_password' diff --git a/askbot/deps/django_authopenid/views.py b/askbot/deps/django_authopenid/views.py index 9a4461ca..5a5c6b90 100644 --- a/askbot/deps/django_authopenid/views.py +++ b/askbot/deps/django_authopenid/views.py @@ -859,53 +859,6 @@ def finalize_generic_signin( user_identifier=user_identifier ) -@login_required -@csrf.csrf_protect -def verify_user_information(request): - """this view collects the same information from - user ase :func:`register`, but requires that user is - already logged in and does not create a new user record - or change anything in instances of :class:`UserAssociation` - """ - register_form = forms.OpenidRegisterForm( - initial={ - 'next': reverse('index'), - 'username': request.user.username, - 'email': request.user.email - } - ) - email_feeds_form = askbot_forms.SimpleEmailSubscribeForm() - - if request.method == 'POST': - register_form = forms.OpenidRegisterForm(request.POST) - email_feeds_form = askbot_forms.SimpleEmailSubscribeForm(request.POST) - if register_form.is_valid() and email_feeds_form.is_valid(): - - email_feeds_form.save(request.user) - - request.user.username = register_form.cleaned_data['username'] - request.user.email = register_form.cleaned_data['email'] - request.user.save() - - if askbot_settings.EMAIL_VALIDATION == True: - logging.debug('sending email validation') - send_new_email_key(request.user, nomessage=True) - output = validation_email_sent(request) - set_email_validation_message(request.user) #message set after generating view - return output - - logging.debug('success, send user to main page') - return HttpResponseRedirect(reverse('index')) - - logging.debug('printing authopenid/complete.html output') - data = { - 'openid_register_form': register_form, - 'email_feeds_form': email_feeds_form, - 'default_form_action': request.path #post to this view - } - return render_into_skin('authopenid/complete.html', data, request) - - @not_authenticated @csrf.csrf_protect def register(request, login_provider_name=None, user_identifier=None): @@ -1251,7 +1204,7 @@ def send_email_key(email, key, handler_url_name='user_account_recover'): } template = get_template('authopenid/email_validation.txt') message = template.render(data) - send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [email]) + send_mail(subject, message, django_settings.DEFAULT_FROM_EMAIL, [email]) def send_user_new_email_key(user): user.email_key = util.generate_random_key() diff --git a/askbot/models/question.py b/askbot/models/question.py index deca7624..e8ee7a7b 100644 --- a/askbot/models/question.py +++ b/askbot/models/question.py @@ -510,7 +510,7 @@ class Thread(models.Model): * more_users_count - remaining count of shared-with users * more_groups_count - remaining count of shared-with groups """ - shared_users = thread.get_users_shared_with( + shared_users = self.get_users_shared_with( max_count=2,#"visitor" is implicit exclude_user=visitor ) @@ -520,7 +520,7 @@ class Thread(models.Model): sharing_info = { 'users': shared_users, - 'groups': thread.get_groups_shared_with(max_count=3), + 'groups': self.get_groups_shared_with(max_count=3), 'more_users_count': max(0, ugroups.count() - 3), 'more_groups_count': max(0, ggroups.count() - 3) } diff --git a/askbot/skins/common/media/js/utils.js b/askbot/skins/common/media/js/utils.js index a3793fe6..81e84692 100644 --- a/askbot/skins/common/media/js/utils.js +++ b/askbot/skins/common/media/js/utils.js @@ -395,7 +395,7 @@ TippedInput.prototype.decorate = function(element){ .addClass('blank'); } }); - makeKeyHandler(13, function(){ + makeKeyHandler(27, function(){ $(element).blur(); }); }; diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index 425e39f8..cb72efe4 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -1461,6 +1461,7 @@ ul#related-tags li { } table.proxy-user-info { border-spacing: 0px; + width: 100%; .form-item { float: left; diff --git a/askbot/tests/badge_tests.py b/askbot/tests/badge_tests.py index b66eadcc..0ed4b343 100644 --- a/askbot/tests/badge_tests.py +++ b/askbot/tests/badge_tests.py @@ -318,7 +318,7 @@ class BadgeTests(AskbotTestCase): def test_guru_badge1(self): self.assert_guru_badge_works('upvote_answer') - def test_guru_badge1(self): + def test_guru_badge2(self): self.assert_guru_badge_works('accept_best_answer') def test_necromancer_badge(self): |