{% trans "OSQA administration area" %} - {% block subtitle %}{% endblock %}

{% autoescape off %} {% for message in user_messages %} @@ -52,6 +52,7 @@ {% endautoescape %} {% block admincontent %}{% endblock %}

+ {% if not hide_menu %} + {% endif %}

OSQA {{ settings.OSQA_VERSION }} ({{ settings.SVN_REVISION }}) diff --git a/forum/skins/default/templates/osqaadmin/nodeman.html b/forum/skins/default/templates/osqaadmin/nodeman.html new file mode 100644 index 0000000..9e6c194 --- /dev/null +++ b/forum/skins/default/templates/osqaadmin/nodeman.html @@ -0,0 +1,104 @@ +{% extends basetemplate %} + +{% load i18n %} +{% load user_tags %} + +{% block adminjs %} + + +{% endblock %} + +{% block subtitle %} + {% trans "Node manager" %} +{% endblock %} +{% block description %} + {% trans "Nodes bulk management" %} +{% endblock %} + +{% block admincontent %} +

+ +

{% trans "Filter" %}

{% trans "By type" %}

+ {{ name }} + + {% endfor %} +

{% trans "By state" %}

{% trans "any" %} + {% for state_type in state_types %} + + {{ state_type }} + + {% endfor %} +

+ + + + + {% ifequal filter_form.node_type.data "all" %} + + {% endifequal %} + + + + + + {% for node in nodes.paginator.page %} + + + {% ifequal filter_form.node_type.data "all" %} + + {% endifequal %} + + + + {% endfor %} + +

+ +	{% trans "Type" %}	{% trans "Title" %}	{% trans "Author" %}
	{{ node.friendly_name }}	{{ node.headline }}	{{ node.author.username }}

+ {{ nodes.paginator.page_numbers }} +

+{% endblock %} \ No newline at end of file diff --git a/forum/skins/default/templates/paginator/page_numbers.html b/forum/skins/default/templates/paginator/page_numbers.html index 50e5252..abe021d 100644 --- a/forum/skins/default/templates/paginator/page_numbers.html +++ b/forum/skins/default/templates/paginator/page_numbers.html @@ -1,7 +1,7 @@ {% spaceless %} {% load i18n %} -

{% if has_previous %} « {% trans "previous" %} {% endif %} @@ -9,9 +9,9 @@ {% if range %} {% for num, url in range %} {% ifequal num current %} - {{ num }} + {{ num }} {% else %} - {{ num }} + {{ num }} {% endifequal %} {% endfor %} {% else %} @@ -21,5 +21,5 @@ {% if has_next %} {% trans "next page" %} » {% endif %} -

{% endspaceless %} \ No newline at end of file diff --git a/forum/urls.py b/forum/urls.py index c5a8a16..f39533a 100644 --- a/forum/urls.py +++ b/forum/urls.py @@ -49,6 +49,7 @@ urlpatterns += patterns('', {'content': settings.ABOUT_PAGE_TEXT, 'title': _('About')}, name='about'), url(r'^%s$' % _('markdown_help/'), app.meta.markdown_help, name='markdown_help'), url(r'^opensearch\.xml$', app.meta.opensearch, name='opensearch'), + url(r'^opensearch\.xml$', app.meta.opensearch, name='opensearch'), url(r'^%s$' % _('privacy/'), app.meta.privacy, name='privacy'), url(r'^%s$' % _('logout/'), app.meta.logout, name='logout'), url(r'^%s(?P\d+)/%s$' % (_('answers/'), _('edit/')), app.writers.edit_answer, @@ -190,13 +191,15 @@ urlpatterns += patterns('', name="admin_flagged_posts"), url(r'^%s%s$' % (_('admin/'), _('static_pages/')), app.admin.static_pages, name="admin_static_pages"), - url(r'^%s%s$' % (_('admin/'), _('moderation/')), app.admin.moderation, name="admin_moderation"), url(r'^%s%s%s$' % (_('admin/'), _('static_pages/'), _('new/')), app.admin.edit_page, name="admin_new_page"), url(r'^%s%s%s(?P\d+)/$' % (_('admin/'), _('static_pages/'), _('edit/')), app.admin.edit_page , name="admin_edit_page"), + url(r'^%s%s(?P\w+)/$' % (_('admin/'), _('tools/')), app.admin.tools_page, + name="admin_tools"), + url(r'^%s%s(?P\w+)/$' % (_('admin/'), _('settings/')), app.admin.settings_set, name="admin_set"), diff --git a/forum/views/admin.py b/forum/views/admin.py index 7b10f7c..a6a30c0 100644 --- a/forum/views/admin.py +++ b/forum/views/admin.py @@ -1,5 +1,5 @@ from datetime import datetime, timedelta -import time +import os, time, csv, random from django.shortcuts import render_to_response, get_object_or_404 from django.core.urlresolvers import reverse @@ -10,13 +10,17 @@ from django.utils.translation import ugettext as _ from django.utils import simplejson from django.db import models from forum.settings.base import Setting -from forum.forms import MaintenanceModeForm, PageForm +from forum.forms import MaintenanceModeForm, PageForm, NodeManFilterForm from forum.settings.forms import SettingsSetForm +from forum.utils import pagination -from forum.models import Question, Answer, User, Node, Action, Page +from forum.models import Question, Answer, User, Node, Action, Page, NodeState +from forum.models.node import NodeMetaClass from forum.actions import NewPageAction, EditPageAction, PublishAction from forum import settings +TOOLS = {} + def super_user_required(fn): def wrapper(request, *args, **kwargs): if request.user.is_authenticated() and request.user.is_superuser: @@ -40,6 +44,8 @@ def admin_page(fn): 'form', 'moderation', 'css', 'headandfoot', 'head', 'view', 'urls')] , lambda s1, s2: s1.weight - s2.weight) + context['tools'] = TOOLS + unsaved = request.session.get('previewing_settings', {}) context['unsaved'] = set([getattr(settings, s).set.name for s in unsaved.keys() if hasattr(settings, s)]) @@ -49,14 +55,26 @@ def admin_page(fn): return wrapper +def admin_tools_page(name, label): + def decorator(fn): + fn.label = label + TOOLS[name] = fn + + return fn + return decorator + +class ActivityPaginatorContext(pagination.PaginatorContext): + def __init__(self): + super (ActivityPaginatorContext, self).__init__('ADMIN_RECENT_ACTIVITY', pagesizes=(20, 40, 80), default_pagesize=40) + @admin_page def dashboard(request): - return ('osqaadmin/dashboard.html', { + return ('osqaadmin/dashboard.html', pagination.paginated(request, ("recent_activity", ActivityPaginatorContext()), { 'settings_pack': unicode(settings.SETTINGS_PACK), 'statistics': get_statistics(), 'recent_activity': get_recent_activity(), 'flagged_posts': get_flagged_posts(), - }) + })) @super_user_required def interface_switch(request): @@ -104,6 +122,13 @@ def statistics(request): ] } +@admin_page +def tools_page(request, name): + if not name in TOOLS: + raise Http404 + + return TOOLS[name](request) + @admin_page def settings_set(request, set_name): @@ -161,7 +186,7 @@ def get_default(request, set_name, var_name): def get_recent_activity(): - return Action.objects.order_by('-action_date')[0:30] + return Action.objects.order_by('-action_date') def get_flagged_posts(): return Action.objects.filter(canceled=False, action_type="flag").order_by('-action_date')[0:30] @@ -355,78 +380,57 @@ def edit_page(request, id=None): 'published': published }) -@admin_page -def moderation(request): - if request.POST: - if not 'ids' in request.POST: - verify = None - else: - sort = { - 'high-rep': '-reputation', - 'newer': '-date_joined', - 'older': 'date_joined', - }.get(request.POST.get('sort'), None) - - if sort: - try: - limit = int(request.POST['limit']) - except: - limit = 5 - - verify = User.objects.order_by(sort)[:limit] - else: - verify = None - if verify: - possible_cheaters = [] - verify = User.objects.order_by(sort)[:5] - cheat_score_sort = lambda c1, c2: cmp(c2.fdata['fake_score'], c1.fdata['fake_score']) +@admin_tools_page(_("nodeman"), _("Node management")) +def node_management(request): + nodes = Node.objects.all() - for user in verify: - possible_fakes = [] - affecters = User.objects.filter(actions__node__author=user, actions__canceled=False).annotate( - affect_count=models.Count('actions')).order_by('-affect_count') - user_ips = set(Action.objects.filter(user=user).values_list('ip', flat=True).distinct('ip')) + if (request.GET): + filter_form = NodeManFilterForm(request.GET) + else: + filter_form = NodeManFilterForm({'node_type': 'all', 'state_type': 'any'}) + + if filter_form.is_valid(): + data = filter_form.cleaned_data - for affecter in affecters: - if affecter == user: - continue + if data['node_type'] != 'all': + nodes = nodes.filter(node_type=data['node_type']) - data = {'affect_count': affecter.affect_count} + if (data['state_type'] != 'any'): + nodes = nodes.filter_state(**{str(data['state_type']): True}) - total_actions = affecter.actions.filter(canceled=False).exclude(node=None).count() - ratio = (float(affecter.affect_count) / float(total_actions)) * 100 + if data['text']: + filter = None - if total_actions > 10 and ratio > 50: - data['total_actions'] = total_actions - data['action_ratio'] = ratio + if data['text_in'] == 'title' or data['text_in'] == 'both': + filter = models.Q(title__icontains=data['text']) + + if data['text_in'] == 'body' or data['text_in'] == 'both': + sec_filter = models.Q(body__icontains=data['text']) + if filter: + filter = filter | sec_filter + else: + filter = sec_filter - affecter_ips = set( - Action.objects.filter(user=affecter).values_list('ip', flat=True).distinct('ip')) - cross_ips = len(user_ips & affecter_ips) + if filter: + nodes = nodes.filter(filter) - data['cross_ip_count'] = cross_ips - data['total_ip_count'] = len(affecter_ips) - data['cross_ip_ratio'] = (float(data['cross_ip_count']) / float(data['total_ip_count'])) * 100 - if affecter.email_isvalid: - email_score = 0 - else: - email_score = 50.0 + node_types = [('all', _("all"))] + [(k, n.friendly_name) for k, n in NodeMetaClass.types.items()] + state_types = NodeState.objects.filter(node__in=nodes).values_list('state_type', flat=True).distinct('state_type') - data['fake_score'] = ((data['cross_ip_ratio'] + data['action_ratio'] + email_score) / 100) * 4 + return ('osqaadmin/nodeman.html', pagination.paginated(request, ("nodes", ActivityPaginatorContext()), { + 'nodes': nodes, + 'node_types': node_types, + 'state_types': state_types, + 'filter_form': filter_form, + 'hide_menu': True + })) - affecter.fdata = data - possible_fakes.append(affecter) - if len(possible_fakes) > 0: - possible_fakes = sorted(possible_fakes, cheat_score_sort) - possible_cheaters.append((user, possible_fakes)) - return ('osqaadmin/moderation.html', {'cheaters': possible_cheaters}) - return ('osqaadmin/moderation.html', {}) -- 2.45.2