diff options
| -rw-r--r-- | askbot/doc/source/contributors.rst | 1 | ||||
| -rw-r--r-- | askbot/media/style/style.css | 30 | ||||
| -rw-r--r-- | askbot/media/style/style.less | 42 | ||||
| -rw-r--r-- | askbot/tests/management_command_tests.py | 11 |
4 files changed, 14 insertions, 70 deletions
diff --git a/askbot/doc/source/contributors.rst b/askbot/doc/source/contributors.rst index 44cd8ccb..85d252bc 100644 --- a/askbot/doc/source/contributors.rst +++ b/askbot/doc/source/contributors.rst @@ -47,6 +47,7 @@ Programming, bug fixes and documentation * `Jorge López Pérez <https://github.com/adobo>`_ * `Zafer Cakmak <https://github.com/xaph>`_ * `Kevin Porterfield <http://www.shotgunsoftware.com>_` +* `Robert Martin <https://github.com/bobbydavid>_` Translations ------------ diff --git a/askbot/media/style/style.css b/askbot/media/style/style.css index 3aab9f21..fc57e2b2 100644 --- a/askbot/media/style/style.css +++ b/askbot/media/style/style.css @@ -1742,7 +1742,7 @@ ul#related-tags li { } .groups-input, .users-input { - width: 152px; + width: 150px; padding-left: 5px; border: #c9c9b5 1px solid; height: 25px; @@ -1751,7 +1751,7 @@ ul#related-tags li { .add-groups, .add-users { border: 0; - margin-top: -2px; + margin: -2px 0 0 0 !important; } .share-input-col { width: 160px; @@ -1771,32 +1771,6 @@ ul#related-tags li { width: 395px; font-size: 14px; } -.groups-input, -.users-input { - width: 152px; - padding-left: 5px; - border: #c9c9b5 1px solid; - height: 25px; - font-size: 14px; -} -.add-groups, -.add-users { - border: 0; - margin-top: -2px; -} -.add-everyone-group { - text-align: center; - margin: auto; - display: block; - padding: 0 10px; -} -#id_user, -#id_user_author { - height: 25px; - padding-left: 5px; - width: 395px; - font-size: 14px; -} .title-desc { color: #707070; font-size: 13px; diff --git a/askbot/media/style/style.less b/askbot/media/style/style.less index efde976d..b68eaab2 100644 --- a/askbot/media/style/style.less +++ b/askbot/media/style/style.less @@ -1838,17 +1838,17 @@ ul#related-tags li { .groups-input, .users-input { - width:152px; - padding-left:5px; - border:#c9c9b5 1px solid; - height:25px; + width: 150px; + padding-left: 5px; + border: #c9c9b5 1px solid; + height: 25px; font-size: 14px; } .add-groups, .add-users { - border:0; - margin-top:-2px; + border: 0; + margin: -2px 0 0 0 !important; } .share-input-col { @@ -1872,36 +1872,6 @@ ul#related-tags li { font-size:14px; } -.groups-input, -.users-input { - width:152px; - padding-left:5px; - border:#c9c9b5 1px solid; - height:25px; - font-size: 14px; -} - -.add-groups, -.add-users { - border:0; - margin-top:-2px; -} - -.add-everyone-group { - text-align: center; - margin: auto; - display: block; - padding: 0 10px; -} - -#id_user, -#id_user_author { - height:25px; - padding-left:5px; - width:395px; - font-size:14px; -} - .title-desc { color: @info-text; font-size: 13px; diff --git a/askbot/tests/management_command_tests.py b/askbot/tests/management_command_tests.py index e9341a8b..f1c6728d 100644 --- a/askbot/tests/management_command_tests.py +++ b/askbot/tests/management_command_tests.py @@ -34,20 +34,19 @@ class ManagementCommandTests(AskbotTestCase): question = self.post_question(user=user_one) comment = self.post_comment(user=user_one, parent_post=question) number_of_gold = 50 - user_one.gold = number_of_gold + user_one.gold = number_of_gold reputation = 20 - user_one.reputation = reputation + user_one.reputation = reputation user_one.save() # Create a second user and transfer all objects from 'user_one' to 'user_two' user_two = self.create_user(username='unique') + user_two_pk = user_two.pk management.call_command('merge_users', user_one.id, user_two.id) # Check that the first user was deleted self.assertEqual(models.User.objects.filter(pk=user_one.id).count(), 0) # Explicitly check that the values assigned to user_one are now user_two's self.assertEqual(user_two.posts.get_questions().filter(pk=question.id).count(), 1) self.assertEqual(user_two.posts.get_comments().filter(pk=comment.id).count(), 1) - #todo: change groups to django groups - #then replace to 3 back to 2 in the line below - user_two = models.User.objects.get(pk=2) - self.assertEqual(user_two.gold, number_of_gold) + user_two = models.User.objects.get(pk=user_two_pk) + self.assertEqual(user_two.gold, number_of_gold) self.assertEqual(user_two.reputation, reputation) |