diff options
author | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-09-03 11:57:10 -0400 |
---|---|---|
committer | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-09-03 11:57:10 -0400 |
commit | dc31cd1b658067d25cda470795020d3c377feae0 (patch) | |
tree | 4a9d270bb90dbf699b035c62ffa4216dcb153d61 /mediagoblin/tests/test_modelmethods.py | |
parent | 1bb367f6136ae4cbcdf6dd86af65eb613913dbd8 (diff) | |
download | mediagoblin-dc31cd1b658067d25cda470795020d3c377feae0.tar.lz mediagoblin-dc31cd1b658067d25cda470795020d3c377feae0.tar.xz mediagoblin-dc31cd1b658067d25cda470795020d3c377feae0.zip |
I've moved on to one of the last phases of my work! Now I'm just checking off
items from my last to-do list. The biggest change in this commit is that I made
the moderation reports panel sortable via get request. I also added in page nu-
mbers so that more than 10 reports can be viewed. I'm hoping to go from here to
make a search page. Aside from that, there were only a few other changes I made
this time. I fixed two bugs in my code. I copy-ed and pasted function
mediagoblin.user_pages.views:media_preview_comment which I must've deleted ear-
-lier in a merge. And I moved some of the javascript I was using in the modera-
-tion templates into it's own seperate .js file.
===============================================================================
Made the moderation reports panel view sortable
===============================================================================
--\ mediagoblin/moderation/forms.py
--\ mediagoblin/moderation/views.py
--\ mediagoblin/templates/mediagoblin/moderation/report_panel.html
--\ mediagoblin/templates/mediagoblin/moderation/user.html
--| Made `<user> report history` into a link that automatically shows all open
| and closed reports on <user>.
===============================================================================
Grabbed some code from master that I accidentally deleted in a merge
===============================================================================
--\ mediagoblin/user_pages/views.py
===============================================================================
Moved javascript away from templates into its own file
===============================================================================
--\ mediagoblin/static/js/setup_report_forms.js
--\ mediagoblin/templates/mediagoblin/moderation/report.html
--\ mediagoblin/templates/mediagoblin/moderation/user.html
===============================================================================
Cleared trailing white space
===============================================================================
--\ mediagoblin/templates/mediagoblin/moderation/media_panel.html
--\ mediagoblin/moderation/tools.py
--\ mediagoblin/templates/mediagoblin/meta/terms_of_service.html
--\ mediagoblin/templates/mediagoblin/moderation/report_panel.html
--\ mediagoblin/templates/mediagoblin/user_pages/media.html
--\ mediagoblin/tests/test_modelmethods.py
===============================================================================
Small fixes
===============================================================================
--\ mediagoblin/templates/mediagoblin/moderation/report.html
--| Fixed a link so that it points to the correct user page
--\ mediagoblin/templates/mediagoblin/user_pages/media.html
--| Fixed a bug that crashed this page when a guest visitted it (because
| request.user is None)
Diffstat (limited to 'mediagoblin/tests/test_modelmethods.py')
-rw-r--r-- | mediagoblin/tests/test_modelmethods.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/tests/test_modelmethods.py b/mediagoblin/tests/test_modelmethods.py index 4af66072..86513c76 100644 --- a/mediagoblin/tests/test_modelmethods.py +++ b/mediagoblin/tests/test_modelmethods.py @@ -47,7 +47,7 @@ class TestMediaEntrySlugs(object): entry.id = this_id entry.uploader = uploader or self.chris_user.id entry.media_type = u'image' - + if save: entry.save() @@ -99,7 +99,7 @@ class TestMediaEntrySlugs(object): u"Beware, I exist!!", this_id=9000, save=False) entry.generate_slug() assert entry.slug == u"beware-i-exist-test" - + _real_test() def test_existing_slug_cant_use_id_extra_junk(self, test_app): |