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)
This commit is contained in:
67
mediagoblin/static/js/setup_report_forms.js
Normal file
67
mediagoblin/static/js/setup_report_forms.js
Normal file
@@ -0,0 +1,67 @@
|
||||
/**
|
||||
* GNU MediaGoblin -- federated, autonomous media hosting
|
||||
* Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS.
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
function init_report_resolution_form() {
|
||||
hidden_input_names = {
|
||||
'takeaway':['take_away_privileges'],
|
||||
'userban':['user_banned_until','why_user_was_banned'],
|
||||
'sendmessage':['message_to_user']
|
||||
}
|
||||
init_user_banned_form();
|
||||
$('form#resolution_form').hide()
|
||||
$('#open_resolution_form').click(function() {
|
||||
$('form#resolution_form').toggle();
|
||||
$.each(hidden_input_names, function(key, list){
|
||||
$.each(list, function(index, name){
|
||||
$('label[for='+name+']').hide();
|
||||
$('#'+name).hide();
|
||||
});
|
||||
});
|
||||
});
|
||||
$('#action_to_resolve').change(function() {
|
||||
$('ul#action_to_resolve li input:checked').each(function() {
|
||||
$.each(hidden_input_names[$(this).val()], function(index, name){
|
||||
$('label[for='+name+']').show();
|
||||
$('#'+name).show();
|
||||
});
|
||||
});
|
||||
$('ul#action_to_resolve li input:not(:checked)').each(function() {
|
||||
$.each(hidden_input_names[$(this).val()], function(index, name){
|
||||
$('label[for='+name+']').hide();
|
||||
$('#'+name).hide();
|
||||
});
|
||||
});
|
||||
});
|
||||
$("#submit_this_report").click(function(){
|
||||
submit_user_banned_form()
|
||||
});
|
||||
}
|
||||
|
||||
function submit_user_banned_form() {
|
||||
if ($("#user_banned_until").val() == 'YYYY-MM-DD'){
|
||||
$("#user_banned_until").val("");
|
||||
}
|
||||
}
|
||||
|
||||
function init_user_banned_form() {
|
||||
$('#user_banned_until').val("YYYY-MM-DD")
|
||||
$("#user_banned_until").focus(function() {
|
||||
$(this).val("");
|
||||
$(this).unbind('focus');
|
||||
});
|
||||
}
|
||||
Reference in New Issue
Block a user