src_prepare/euscan-ng
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

euscanwww: Moving all account related stuff to a separate app

Browse Source 
Note: This commit could break things, the userprofile model has been
moved so the db layout must change (some alter table commands are
needed to don't lose data)

Signed-off-by: volpino <fox91@anche.no>
This commit is contained in:
volpino
2012-11-02 17:33:00 +01:00
parent 2bf0061979
commit c31076ddb4
31 changed files with 696 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
euscanwww/djeuscan/admin.py
View File

@ -1,6 +1,6 @@
from djeuscan.models import Package, Version, VersionLog, EuscanResult, \
Log, WorldLog, CategoryLog, HerdLog, MaintainerLog, Herd, Maintainer, \
RefreshPackageQuery, Category, Overlay, ProblemReport, UserProfile
RefreshPackageQuery, Category, Overlay, ProblemReport
from django.contrib import admin
@ -37,8 +37,6 @@ class ProblemReportAdmin(admin.ModelAdmin):
ordering = ["-datetime"]
admin.site.register(UserProfile)
admin.site.register(Package, PackageAdmin)
admin.site.register(Herd, HerdAdmin)

27
euscanwww/djeuscan/feeds.py
View File

@ -9,7 +9,8 @@ from django.db.models import Q
from euscan.version import gentoo_unstable
from djeuscan.models import Package, Herd, Maintainer, VersionLog
from djeuscan.helpers import get_profile, get_account_versionlogs
from euscan_accounts.helpers import get_profile
class BaseFeed(Feed):
@ -217,30 +218,6 @@ class CategoryFeed(BaseFeed):
return VersionLog.objects.for_category(data["obj"]), 100
class UserFeed(BaseFeed):
link = "/"
def description(self, data):
return "%s - last euscan changes" % data["user"]
def title(self, data):
return "%s - watched packages" % data["user"]
def get_object(self, request):
return {
"user": request.user,
"options": request.GET,
}
def _items(self, data):
user = data["user"]
profile = get_profile(user)
vlogs = get_account_versionlogs(profile)
return vlogs, 100
class WorldScanFeed(BaseFeed):
link = "/"

39
euscanwww/djeuscan/forms.py
View File

@ -1,6 +1,5 @@
from django import forms
from djeuscan.models import Version, ProblemReport, UserProfile
from djeuscan.models import Version, ProblemReport
class WorldForm(forms.Form):
@ -27,39 +26,3 @@ class ProblemReportForm(forms.ModelForm):
class Meta:
model = ProblemReport
fields = ('version', 'subject', 'message')
class PreferencesForm(forms.Form):
first_name = forms.CharField(max_length=30, required=False)
last_name = forms.CharField(max_length=30, required=False)
email = forms.EmailField()
feed_upstream_info = forms.BooleanField(required=False,
label="Upstream info")
feed_portage_info = forms.BooleanField(required=False,
label="Portage info")
feed_show_adds = forms.BooleanField(required=False,
label="Show version bumps")
feed_show_removals = forms.BooleanField(required=False,
label="Show version removals")
feed_ignore_pre = forms.BooleanField(required=False,
label="Ignore unstable releases")
feed_ignore_pre_if_stable = forms.BooleanField(
required=False,
label="Ignore unstable releases if current version is stable"
)
email_activated = forms.BooleanField(
required=False, label="Receive euscan emails"
)
email_every = forms.ChoiceField(
choices=UserProfile.EMAIL_OPTS,
label="Send email",
)
email_ignore_pre = forms.BooleanField(
required=False, label="Ignore unstable releases"
)
email_ignore_pre_if_stable = forms.BooleanField(
required=False,
label="Ignore unstable releases if current version is stable"
)

86
euscanwww/djeuscan/helpers.py
View File

@ -3,7 +3,7 @@ djeuscan.helpers
"""
from distutils.version import StrictVersion, LooseVersion
from django.db.models import Q
from django.shortcuts import get_object_or_404
def xint(i):
@ -77,81 +77,9 @@ class catch_and_return(object):
return wrapper
def get_profile(user):
from djeuscan.models import UserProfile
try:
return user.get_profile()
except UserProfile.DoesNotExist:
UserProfile.objects.create(user=user)
return user.get_profile()
def get_account_categories(user):
from djeuscan.models import Package
# TODO: This is quite ugly
category_names = [obj.name for obj in get_profile(user).categories.all()]
return [c for c in Package.objects.categories()
if c["category"] in category_names]
def get_account_herds(user):
from djeuscan.models import Package
ids = [herd.pk for herd in get_profile(user).herds.all()]
return Package.objects.herds(ids=ids)
def get_account_maintainers(user):
from djeuscan.models import Package
ids = [obj.pk for obj in get_profile(user).maintainers.all()]
return Package.objects.maintainers(ids=ids)
def get_account_versionlogs(profile):
"""
Returns all watched packages
"""
from djeuscan.models import Package, VersionLog
q_categories = Q(category__in=[
category.name for category in profile.categories.all()])
q_herds = Q(herds__in=profile.herds.all())
q_maintainers = Q(maintainers__in=profile.maintainers.all())
packages = list(profile.packages.all()) + list(Package.objects.filter(
q_categories | q_herds | q_maintainers))
overlays = [o.name for o in profile.overlays.all()]
return VersionLog.objects.filter(
Q(package__in=packages) | Q(overlay__in=overlays)
)
def get_user_fav_infos(user):
upstream_k = lambda c: c["n_versions"] - c["n_packaged"] - c["n_overlay"]
categories = sorted(get_account_categories(user),
key=upstream_k, reverse=True)
c_upstream = sum([upstream_k(c) for c in categories])
herds = sorted(get_account_herds(user),
key=upstream_k, reverse=True)
h_upstream = sum([upstream_k(c) for c in herds])
maintainers = sorted(get_account_maintainers(user),
key=upstream_k, reverse=True)
m_upstream = sum([upstream_k(c) for c in maintainers])
packages = sorted(
get_profile(user).packages.all(),
key=lambda p: p.n_versions - p.n_packaged - p.n_overlay,
reverse=True
)
p_upstream = sum(
[c.n_versions - c.n_packaged - c.n_overlay for c in packages]
)
return {
"categories": categories, "categories_upstream": c_upstream,
"herds": herds, "herds_upstream": h_upstream,
"maintainers": maintainers, "maintainers_upstream": m_upstream,
"packages": packages, "packages_upstream": p_upstream,
}
def get_maintainer_or_404(id=None, email=None):
from djeuscan.models import Maintainer
if id:
return get_object_or_404(Maintainer, pk=id)
else:
return get_object_or_404(Maintainer, email=email)

31
euscanwww/djeuscan/models.py
View File

@ -265,37 +265,6 @@ class Overlay(models.Model):
return self.name
class UserProfile(models.Model):
EMAIL_SCAN = 1
EMAIL_WEEKLY = 2
EMAIL_MONTHLY = 3
EMAIL_OPTS = (
(EMAIL_SCAN, 'On updates'),
(EMAIL_WEEKLY, 'Weekly'),
(EMAIL_MONTHLY, 'Monthly')
)
user = models.OneToOneField(User)
herds = models.ManyToManyField(Herd)
maintainers = models.ManyToManyField(Maintainer)
packages = models.ManyToManyField(Package)
categories = models.ManyToManyField(Category)
overlays = models.ManyToManyField(Overlay)
feed_upstream_info = models.BooleanField(default=True)
feed_portage_info = models.BooleanField(default=False)
feed_show_adds = models.BooleanField(default=True)
feed_show_removals = models.BooleanField(default=True)
feed_ignore_pre = models.BooleanField(default=False)
feed_ignore_pre_if_stable = models.BooleanField(default=False)
email_activated = models.BooleanField(default=True)
email_every = models.IntegerField(choices=EMAIL_OPTS, default=EMAIL_SCAN)
email_ignore_pre = models.BooleanField(default=False)
email_ignore_pre_if_stable = models.BooleanField(default=False)
last_email = models.DateTimeField(auto_now_add=True)
class Log(models.Model):
"""
Model used for keeping data for charts

7
euscanwww/djeuscan/tasks.py
View File

@ -15,10 +15,11 @@ from django.db.models import Q
from euscan.version import gentoo_unstable
from djeuscan.models import Package, RefreshPackageQuery, UserProfile, \
VersionLog
from djeuscan.models import Package, RefreshPackageQuery, VersionLog
from djeuscan.processing import scan, misc
from djeuscan.helpers import get_account_versionlogs, get_user_fav_infos
from euscan_accounts.helpers import get_account_versionlogs, get_user_fav_infos
from euscan_accounts.models import UserProfile
class TaskFailedException(Exception):

15
euscanwww/djeuscan/templates/euscan/accounts/categories.html
View File

@ -1,15 +0,0 @@
{% extends "euscan/_datatable.html" %}
{% load url from future %}
{% load djeuscan_helpers %}
{% block title %}
{{ block.super }} - Watched categories
{% endblock %}
{% block content %}
<h2>Watched categories</h2>
{% categories_table categories %}
{% endblock %}

32
euscanwww/djeuscan/templates/euscan/accounts/euscan_email.txt
View File

@ -1,32 +0,0 @@
{% load djeuscan_helpers %}{% load sub %}Hello {{ user }},
{% if vlogs %}euscan news:
{% for vlog in vlogs %} * {{ vlog.package|ljust:"35" }} {{ vlog.version }} {% if vlog.vtype and not vlog.vtype|is_stable %}({{ vlog.vtype }}){% endif %}
{% endfor %}
{% endif %}
Summary:
{% with categories|length as num_categories %}{% if num_categories %}
Watching {{ num_categories }} categor{{ num_categories|pluralize:"y,ies"}}: {{ categories_upstream }} upstream version{{ categories_upstream|pluralize:"s"}}
{% if categories_upstream %}Hot categories:
{% for c in categories|slice:":3" %} * {{ c.category }} ({{ c.n_versions|sub:c.n_packaged|sub:c.n_overlay }})
{% endfor %}
{% endif %}{% endif %}{% endwith %}{% with herds|length as num_herds %}{% if num_herds %}
Watching {{ num_herds }} herd{{ num_herds|pluralize:"s"}}: {{ herds_upstream }} upstream version{{ herds_upstream|pluralize:"s"}}
{% if herds_upstream %}Hot herds:
{% for c in herds|slice:":3" %} * {{ c.herds__herd }} ({{ c.n_versions|sub:c.n_packaged|sub:c.n_overlay }})
{% endfor %}
{% endif %}{% endif %}{% endwith %}{% with maintainers|length as num_maintainers %}{% if num_maintainers %}
Watching {{ num_maintainers }} maintainer{{ num_maintainers|pluralize:"s"}}: {{ maintainers_upstream }} upstream version{{ maintainers_upstream|pluralize:"s"}}
{% if maintainers_upstream %}Hot maintainers:
{% for c in maintainers|slice:":3" %} * {{ c.maintainers__name }} ({{ c.n_versions|sub:c.n_packaged|sub:c.n_overlay }})
{% endfor %}
{% endif %}{% endif %}{% endwith %}{% with packages|length as num_packages %}{% if num_packages %}
Watching {{ num_packages }} package{{ num_packages|pluralize:"s"}}: {{ packages_upstream }} upstream version{{ packages_upstream|pluralize:"s"}}
{% if packages_upstream %}Hot packages:
{% for c in packages|slice:":3" %} * {{ c }} ({{ c.n_versions|sub:c.n_packaged|sub:c.n_overlay }})
{% endfor %}
{% endif %}{% endif %}{% endwith %}
--
This email was sent by euscan, please do not reply.
Go to your euscan account to change email notification settings.

14
euscanwww/djeuscan/templates/euscan/accounts/herds.html
View File

@ -1,14 +0,0 @@
{% extends "euscan/_datatable.html" %}
{% load url from future %}
{% load djeuscan_helpers %}
{% block title %}
{{ block.super }} - Watched herds
{% endblock %}
{% block content %}
<h2>Watched herds</h2>
{% herds_table herds %}
{% endblock %}

110
euscanwww/djeuscan/templates/euscan/accounts/index.html
View File

@ -1,110 +0,0 @@
{% extends "_base.html" %}
{% load url from future %}
{% load sub %}
{% block title %}
{{ block.super }} - Welcome {{ user }}
{% endblock %}
{% block content %}
<h2>
Welcome {{ user }}
<span class="pull-right">
<a href="{% url "auth_password_change" %}" class="btn">
Change password
</a>
<a href="{% url "accounts_preferences" %}" class="btn">
Preferences
</a>
</span>
</h2>
<h3 class="padded">Summary</h3>
<div class="row-fluid padded">
<div class="padded span6">
{% with categories|length as num_categories %}
Watching {{ num_categories }} categor{{ num_categories|pluralize:"y,ies"}}
<ul>
<li>{{ categories_upstream }} new upstream version{{ categories_upstream|pluralize:"s"}}</li>
{% if categories_upstream %}
<li>
Hot categories:
<ul>
{% for c in categories|slice:":3" %}
<li><a href="{% url "category" c.category %}">{{ c.category }}</a> ({{ c.n_versions|sub:c.n_packaged|sub:c.n_overlay }})</li>
{% endfor %}
</ul>
</li>
{% endif %}
</ul>
{% endwith %}
</div>
<div class="padded span6">
{% with herds|length as num_herds %}
Watching {{ num_herds }} herd{{ num_herds|pluralize:"s"}}
<ul>
<li>{{ herds_upstream }} new upstream version{{ herds_upstream|pluralize:"s"}}</li>
{% if herds_upstream %}
<li>
Hot herds:
<ul>
{% for c in herds|slice:":3" %}
<li><a href="{% url "herd" c.herds__herd %}">{{ c.herds__herd }}</a> ({{ c.n_versions|sub:c.n_packaged|sub:c.n_overlay }})</li>
{% endfor %}
</ul>
</li>
{% endif %}
</ul>
{% endwith %}
</div>
</div>
<div class="padded row-fluid">
<div class="padded span6">
{% with maintainers|length as num_maintainers %}
Watching {{ num_maintainers }} maintainer{{ num_maintainers|pluralize:"s"}}
<ul>
<li>{{ maintainers_upstream }} new upstream version{{ maintainers_upstream|pluralize:"s"}}</li>
{% if maintainers_upstream %}
<li>
Hot maintainers:
<ul>
{% for c in maintainers|slice:":3" %}
<li><a href="{% url "maintainer" c.maintainers__email %}">{{ c.maintainers__name }}</a> ({{ c.n_versions|sub:c.n_packaged|sub:c.n_overlay }})</li>
{% endfor %}
</ul>
</li>
{% endif %}
</ul>
{% endwith %}
</div>
<div class="padded span6">
{% with packages|length as num_packages %}
Watching {{ num_packages }} package{{ num_packages|pluralize:"s"}}
<ul>
<li>{{ packages_upstream }} new upstream version{{ packages_upstream|pluralize:"s"}}</li>
{% if packages_upstream %}
<li>
Hot packages:
<ul>
{% for c in packages|slice:":3" %}
<li><a href="{% url "package" c.category c.name %}">{{ c }}</a> ({{ c.n_versions|sub:c.n_packaged|sub:c.n_overlay }})</li>
{% endfor %}
</ul>
</li>
{% endif %}
</ul>
{% endwith %}
</div>
</div>
<dl>
{% include "euscan/_package_vlogs.html" %}
</dl>
{% endblock %}

14
euscanwww/djeuscan/templates/euscan/accounts/maintainers.html
View File

@ -1,14 +0,0 @@
{% extends "euscan/_datatable.html" %}
{% load url from future %}
{% load djeuscan_helpers %}
{% block title %}
{{ block.super }} - Watched maintainers
{% endblock %}
{% block content %}
<h2>Watched maintainers</h2>
{% maintainers_table maintainers %}
{% endblock %}

15
euscanwww/djeuscan/templates/euscan/accounts/overlays.html
View File

@ -1,15 +0,0 @@
{% extends "euscan/_datatable.html" %}
{% load djeuscan_helpers %}
{% load url from future %}
{% block title %}
{{ block.super }} - Watched overlays
{% endblock %}
{% block content %}
<h2>Watched overlays</h2>
{% overlays_table overlays %}
{% endblock %}

16
euscanwww/djeuscan/templates/euscan/accounts/packages.html
View File

@ -1,16 +0,0 @@
{% extends "euscan/_datatable.html" %}
{% load url from future %}
{% load djeuscan_helpers %}
{% block title %}
{{ block.super }} - Watched packages
{% endblock %}
{% block content %}
<h2>Watched packages</h2>
{% packages packages %}
{% endblock %}

116
euscanwww/djeuscan/templates/euscan/accounts/preferences.html
View File

@ -1,116 +0,0 @@
{% extends "_base.html" %}
{% load url from future %}
{% block title %}
{{ block.super }} - Edit user preferences for {{ user }}
{% endblock %}
{% block css %}
{{ block.super }}
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/toggle_buttons.css" media="screen" title="Normal" />
{% endblock %}
{% block javascript %}
{{ block.super }}
<script type="text/javascript" language="javascript" src="{{STATIC_URL}}js/jquery.js"></script>
<script type="text/javascript" language="javascript" src="{{STATIC_URL}}js/jquery.toggle.buttons.js"></script>
{% endblock %}
{% block content %}
{% if updated %}
<div class="alert alert-success">
<strong>Saved!</strong> Your preferences have been saved
</div>
{% endif %}
<h2>
Edit user preferences
</h2>
<form id="preferences_form" method='post' action='.'>
{% csrf_token %}
<table class="table">
<thead><tr><th>Personal settings</th></tr></thead>
<tr>
<th>{{ form.first_name.label_tag }}</th>
<td>{% if form.first_name.errors %}<ul class="errorlist">{{ form.first_name.errors }}</ul>{% endif %}{{ form.first_name }}</td>
</tr>
<tr>
<th>{{ form.last_name.label_tag }}</th>
<td>{% if form.last_name.errors %}<ul class="errorlist">{{ form.last_name.errors }}</ul>{% endif %}{{ form.last_name }}</td>
</tr>
<tr>
<th>{{ form.email.label_tag }}</th>
<td>{% if form.first_name.errors %}<ul class="errorlist">{{ form.email.errors }}</ul>{% endif %} {{ form.email }}</td>
</tr>
</table>
<table class="table">
<thead><tr><th>Feed settings</th></tr></thead>
<tr>
<th>{{ form.feed_upstream_info.label_tag }}</th>
<td>{{ form.feed_upstream_info }}</td>
</tr>
<tr>
<th>{{ form.feed_portage_info.label_tag }}</th>
<td>{{ form.feed_portage_info }}</td>
</tr>
<tr>
<th>{{ form.feed_show_adds.label_tag }}</th>
<td>{{ form.feed_show_adds }}</td>
</tr>
<tr>
<th>{{ form.feed_show_removals.label_tag }}</th>
<td>{{ form.feed_show_removals }}</td>
</tr>
<tr>
<th>{{ form.feed_ignore_pre.label_tag }}</th>
<td>{{ form.feed_ignore_pre }}</td>
</tr>
<tr>
<th>{{ form.feed_ignore_pre_if_stable.label_tag }}</th>
<td>{{ form.feed_ignore_pre_if_stable }}</td>
</tr>
</table>
<table class="table">
<thead><tr><th>Mail settings</th></tr></thead>
<tr>
<th>{{ form.email_activated.label_tag }}</th>
<td>{{ form.email_activated }}</td>
</tr>
<tr>
<th>{{ form.email_every.label_tag }}</th>
<td>{{ form.email_every }}</td>
</tr>
<tr>
<th>{{ form.email_ignore_pre.label_tag }}</th>
<td>{{ form.email_ignore_pre }}</td>
</tr>
<tr>
<th>{{ form.email_ignore_pre_if_stable.label_tag }}</th>
<td>{{ form.email_ignore_pre_if_stable }}</td>
</tr>
<tr><td>&nbsp;</td><td></td></tr>
<tr>
<td></td>
<td>
<input class="btn btn-large" type='submit' value="Save" />
</td>
</tr>
</table>
</form>
<script type="text/javascript">
$(document).ready(function() {
$("#preferences_form").find("input:checkbox").each(function () {
var div = $("<div/>")
, td = $(this).closest("td");
$(this).remove();
td.append(div.append($(this)));
div.toggleButtons();
});
});
</script>
{% endblock %}

2
euscanwww/djeuscan/tests/test_views.py
View File

@ -5,7 +5,7 @@ try:
except ImportError:
from bs4 import BeautifulSoup
from djeuscan.helpers import get_profile
from euscan_accounts.helpers import get_profile
from djeuscan.tests import SystemTestCase
from djeuscan.tests.euscan_factory import PackageFactory, setup_maintainers, \

54
euscanwww/djeuscan/urls.py
View File

@ -1,14 +1,16 @@
from django.conf.urls.defaults import url, patterns, include
from django.contrib.auth.decorators import user_passes_test
from django.contrib.auth.views import logout
from django.views.generic import RedirectView
from django.contrib.auth.decorators import login_required
from djcelery.views import apply as apply_task
from djeuscan.views import registered_tasks
from euscan_accounts.views import favourite_package, unfavourite_package, \
favourite_category, unfavourite_category, favourite_herd, \
unfavourite_herd, favourite_maintainer, unfavourite_maintainer, \
favourite_overlay, unfavourite_overlay, favourite_world, unfavourite_world
from djeuscan.feeds import PackageFeed, CategoryFeed, HerdFeed, \
MaintainerFeed, GlobalFeed, UserFeed, WorldScanFeed
MaintainerFeed, GlobalFeed, WorldScanFeed
admin_required = user_passes_test(lambda u: u.is_superuser)
@ -17,8 +19,8 @@ admin_required = user_passes_test(lambda u: u.is_superuser)
package_patterns = patterns('djeuscan.views',
url(r'^$', 'package', name="package"),
url(r'^feed/$', PackageFeed(), name='package_feed'),
url(r'^favourite/$', 'favourite_package', name="favourite_package"),
url(r'^unfavourite/$', 'unfavourite_package', name="unfavourite_package"),
url(r'^favourite/$', favourite_package, name="favourite_package"),
url(r'^unfavourite/$', unfavourite_package, name="unfavourite_package"),
url(r'^refresh$', "refresh_package", name="refresh_package"),
url(r'^problem$', 'problem', name="problem"),
)
@ -28,8 +30,8 @@ categories_patterns = patterns('djeuscan.views',
url(r'^feed/$', CategoryFeed(), name='category_feed'),
url(r'^charts/(?P<chart>[\w\-]+).png$', 'chart_category',
name="chart_category"),
url(r'^favourite/$', 'favourite_category', name="favourite_category"),
url(r'^unfavourite/$', 'unfavourite_category',
url(r'^favourite/$', favourite_category, name="favourite_category"),
url(r'^unfavourite/$', unfavourite_category,
name="unfavourite_category"),
)
@ -37,8 +39,8 @@ herds_patterns = patterns('djeuscan.views',
url(r'^(?:view/)?$', 'herd', name="herd"),
url(r'^feed/$', HerdFeed(), name='herd_feed'),
url(r'^charts/(?P<chart>[\w\-]+).png$', 'chart_herd', name="chart_herd"),
url(r'^favourite/$', 'favourite_herd', name="favourite_herd"),
url(r'^unfavourite/$', 'unfavourite_herd', name="unfavourite_herd"),
url(r'^favourite/$', favourite_herd, name="favourite_herd"),
url(r'^unfavourite/$', unfavourite_herd, name="unfavourite_herd"),
)
maintainers_patterns = patterns('djeuscan.views',
@ -46,15 +48,15 @@ maintainers_patterns = patterns('djeuscan.views',
url(r'^feed/$', MaintainerFeed(), name='maintainer_feed'),
url(r'^charts/(?P<chart>[\w\-]+).png$', 'chart_maintainer',
name="chart_maintainer"),
url(r'^favourite/$', 'favourite_maintainer', name="favourite_maintainer"),
url(r'^unfavourite/$', 'unfavourite_maintainer',
url(r'^favourite/$', favourite_maintainer, name="favourite_maintainer"),
url(r'^unfavourite/$', unfavourite_maintainer,
name="unfavourite_maintainer"),
)
overlays_patterns = patterns('djeuscan.views',
url(r'^(?:view/)?$', 'overlay', name="overlay"),
url(r'^favourite/$', 'favourite_overlay', name="favourite_overlay"),
url(r'^unfavourite/$', 'unfavourite_overlay', name="unfavourite_overlay"),
url(r'^favourite/$', favourite_overlay, name="favourite_overlay"),
url(r'^unfavourite/$', unfavourite_overlay, name="unfavourite_overlay"),
)
tasks_patterns = patterns('djeuscan.views',
@ -64,25 +66,6 @@ tasks_patterns = patterns('djeuscan.views',
name="apply_task"),
)
accounts_patterns = patterns('djeuscan.views',
url(r'^profile/$', 'accounts_index', name="accounts_index"),
url(r'^profile/preferences/$', 'accounts_preferences',
name="accounts_preferences"),
url(r'^categories/$', 'accounts_categories', name="accounts_categories"),
url(r'^herds/$', 'accounts_herds', name="accounts_herds"),
url(r'^maintainers/$', 'accounts_maintainers',
name="accounts_maintainers"),
url(r'^packages/$', 'accounts_packages', name="accounts_packages"),
url(r'^overlays/$', 'accounts_overlays', name="accounts_overlays"),
url(r'^feed/$', login_required(UserFeed()), name='user_feed'),
url(r'^logout/$', logout, {'next_page': '/'}),
url(r'^password/change/done/$',
RedirectView.as_view(url="../../../profile/")),
)
urlpatterns = patterns('djeuscan.views',
# Global stuff
@ -99,8 +82,8 @@ urlpatterns = patterns('djeuscan.views',
url(r'^world/$', 'world', name="world"),
url(r'^world/scan/$', 'world_scan', name="world_scan"),
url(r'^world/scan/feed$', WorldScanFeed(), name="world_scan_feed"),
url(r'^world/favourite/$', 'favourite_world', name="favourite_world"),
url(r'^world/unfavourite/$', 'unfavourite_world',
url(r'^world/favourite/$', favourite_world, name="favourite_world"),
url(r'^world/unfavourite/$', unfavourite_world,
name="unfavourite_world"),
# Real data
@ -124,5 +107,4 @@ urlpatterns = patterns('djeuscan.views',
include(package_patterns)),
url(r'^tasks/', include(tasks_patterns)),
url(r'^accounts/', include(accounts_patterns)),
)

226
euscanwww/djeuscan/views.py
View File

@ -8,17 +8,16 @@ from django.shortcuts import get_object_or_404
from django.contrib.auth.decorators import login_required
from django.views.decorators.http import require_POST
from djeuscan.helpers import version_key, packages_from_names, get_profile, \
get_account_categories, get_account_herds, get_account_maintainers, \
get_user_fav_infos
from djeuscan.feeds import UserFeed
from djeuscan.helpers import version_key, packages_from_names, \
get_maintainer_or_404
from djeuscan.models import Version, Package, Herd, Maintainer, EuscanResult, \
VersionLog, RefreshPackageQuery, ProblemReport, Category, Overlay
from djeuscan.forms import WorldForm, PackagesForm, ProblemReportForm, \
PreferencesForm
from djeuscan.forms import WorldForm, PackagesForm, ProblemReportForm
from djeuscan.tasks import admin_tasks
from djeuscan import charts
from euscan_accounts.helpers import get_profile
@render_to('euscan/index.html')
def index(request):
@ -122,13 +121,6 @@ def maintainers(request):
return {'maintainers': maintainers, 'last_scan': last_scan}
def get_maintainer_or_404(id=None, email=None):
if id:
return get_object_or_404(Maintainer, pk=id)
else:
return get_object_or_404(Maintainer, email=email)
@render_to('euscan/maintainer.html')
def maintainer(request, maintainer_id=None, maintainer_email=None):
maintainer = get_maintainer_or_404(maintainer_id, maintainer_email)
@ -422,211 +414,3 @@ def refresh_package(request, category, package):
from djeuscan.tasks import consume_refresh_queue
consume_refresh_queue.delay()
return {"result": "success", "position": obj.position}
@login_required
@render_to('euscan/accounts/index.html')
def accounts_index(request):
user = request.user
infos = get_user_fav_infos(user)
infos['vlog'] = UserFeed().items({'user': user, 'options': {}})
return infos
@login_required
@render_to('euscan/accounts/preferences.html')
def accounts_preferences(request):
user = request.user
prof = get_profile(user)
updated = False
if request.method == "POST":
form = PreferencesForm(request.POST)
if form.is_valid():
user.first_name = form.cleaned_data["first_name"]
user.last_name = form.cleaned_data["last_name"]
user.email = form.cleaned_data["email"]
user.save(force_update=True)
prof.feed_upstream_info = form.cleaned_data["feed_upstream_info"]
prof.feed_portage_info = form.cleaned_data["feed_portage_info"]
prof.feed_show_adds = form.cleaned_data["feed_show_adds"]
prof.feed_show_removals = form.cleaned_data["feed_show_removals"]
prof.feed_ignore_pre = form.cleaned_data["feed_ignore_pre"]
prof.feed_ignore_pre_if_stable = \
form.cleaned_data["feed_ignore_pre_if_stable"]
prof.email_activated = form.cleaned_data["email_activated"]
prof.email_every = form.cleaned_data["email_every"]
prof.email_ignore_pre = form.cleaned_data["email_ignore_pre"]
prof.email_ignore_pre_if_stable = \
form.cleaned_data["email_ignore_pre_if_stable"]
prof.save(force_update=True)
updated = True
else:
initial_data = {
"first_name": user.first_name,
"last_name": user.last_name,
"email": user.email,
"feed_upstream_info": prof.feed_upstream_info,
"feed_portage_info": prof.feed_portage_info,
"feed_show_adds": prof.feed_show_adds,
"feed_show_removals": prof.feed_show_removals,
"feed_ignore_pre": prof.feed_ignore_pre,
"feed_ignore_pre_if_stable": prof.feed_ignore_pre_if_stable,
"email_activated": prof.email_activated,
"email_every": prof.email_every,
"email_ignore_pre": prof.email_ignore_pre,
"email_ignore_pre_if_stable": prof.email_ignore_pre_if_stable,
}
form = PreferencesForm(initial_data)
return {"form": form, "updated": updated}
@login_required
@render_to('euscan/accounts/categories.html')
def accounts_categories(request):
return {"categories": get_account_categories(request.user)}
@login_required
@render_to('euscan/accounts/herds.html')
def accounts_herds(request):
return {"herds": get_account_herds(request.user)}
@login_required
@render_to('euscan/accounts/maintainers.html')
def accounts_maintainers(request):
return {"maintainers": get_account_maintainers(request.user)}
@login_required
@render_to('euscan/accounts/packages.html')
def accounts_packages(request):
return {"packages": get_profile(request.user).packages.all()}
@login_required
@render_to('euscan/accounts/overlays.html')
def accounts_overlays(request):
overlays = [obj.name for obj in get_profile(request.user).overlays.all()]
return {"overlays": overlays}
@login_required
@require_POST
@ajax_request
def favourite_package(request, category, package):
obj = get_object_or_404(Package, category=category, name=package)
get_profile(request.user).packages.add(obj)
return {"success": True}
@login_required
@require_POST
@ajax_request
def unfavourite_package(request, category, package):
package = get_object_or_404(Package, category=category, name=package)
get_profile(request.user).packages.remove(package)
return {"success": True}
@login_required
@require_POST
@ajax_request
def favourite_herd(request, herd):
obj = get_object_or_404(Herd, herd=herd)
get_profile(request.user).herds.add(obj)
return {"success": True}
@login_required
@require_POST
@ajax_request
def unfavourite_herd(request, herd):
herd = get_object_or_404(Herd, herd=herd)
get_profile(request.user).herds.remove(herd)
return {"success": True}
@login_required
@require_POST
@ajax_request
def favourite_maintainer(request, maintainer_id=None, maintainer_email=None):
obj = get_maintainer_or_404(maintainer_id, maintainer_email)
get_profile(request.user).maintainers.add(obj)
return {"success": True}
@login_required
@require_POST
@ajax_request
def unfavourite_maintainer(request, maintainer_id=None, maintainer_email=None):
obj = get_maintainer_or_404(maintainer_id, maintainer_email)
get_profile(request.user).maintainers.remove(obj)
return {"success": True}
@login_required
@require_POST
@ajax_request
def favourite_category(request, category):
obj = Category.objects.get(name=category)
get_profile(request.user).categories.add(obj)
return {"success": True}
@login_required
@require_POST
@ajax_request
def unfavourite_category(request, category):
obj = Category.objects.get(name=category)
get_profile(request.user).categories.remove(obj)
return {"success": True}
@login_required
@require_POST
@ajax_request
def favourite_overlay(request, overlay):
obj = Overlay.objects.get(name=overlay)
get_profile(request.user).overlays.add(obj)
return {"success": True}
@login_required
@require_POST
@ajax_request
def unfavourite_overlay(request, overlay):
obj = Overlay.objects.get(name=overlay)
get_profile(request.user).overlays.remove(obj)
return {"success": True}
@login_required
@require_POST
@ajax_request
def favourite_world(request):
if not "packages[]" in request.POST:
return {"success": False}
packages = request.POST.getlist("packages[]")
objs = Package.objects.filter(id__in=packages)
get_profile(request.user).packages.add(*objs)
return {"success": True}
@login_required
@require_POST
@ajax_request
def unfavourite_world(request):
if not "packages[]" in request.POST:
return {"success": False}
packages = request.POST.getlist("packages[]")
objs = Package.objects.filter(id__in=packages)
get_profile(request.user).packages.remove(*objs)
return {"success": True}