Clean out stuff
This commit is contained in:
parent
fd5927c31a
commit
d7b1910839
47 changed files with 13 additions and 1089 deletions
|
|
@ -1 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
|
|
@ -1,31 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
from __future__ import unicode_literals
|
|
||||||
|
|
||||||
from django.db import models, migrations
|
|
||||||
import django.contrib.sites.models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='Site',
|
|
||||||
fields=[
|
|
||||||
('id', models.AutoField(verbose_name='ID', primary_key=True, serialize=False, auto_created=True)),
|
|
||||||
('domain', models.CharField(verbose_name='domain name', max_length=100, validators=[django.contrib.sites.models._simple_domain_name_validator])),
|
|
||||||
('name', models.CharField(verbose_name='display name', max_length=50)),
|
|
||||||
],
|
|
||||||
options={
|
|
||||||
'verbose_name_plural': 'sites',
|
|
||||||
'verbose_name': 'site',
|
|
||||||
'db_table': 'django_site',
|
|
||||||
'ordering': ('domain',),
|
|
||||||
},
|
|
||||||
managers=[
|
|
||||||
(b'objects', django.contrib.sites.models.SiteManager()),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
@ -1,40 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
from __future__ import unicode_literals
|
|
||||||
|
|
||||||
from django.conf import settings
|
|
||||||
from django.db import migrations
|
|
||||||
|
|
||||||
|
|
||||||
def update_site_forward(apps, schema_editor):
|
|
||||||
"""Set site domain and name."""
|
|
||||||
Site = apps.get_model("sites", "Site")
|
|
||||||
Site.objects.update_or_create(
|
|
||||||
id=settings.SITE_ID,
|
|
||||||
defaults={
|
|
||||||
"domain": "ccdb.info",
|
|
||||||
"name": "ccdb"
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def update_site_backward(apps, schema_editor):
|
|
||||||
"""Revert site domain and name to default."""
|
|
||||||
Site = apps.get_model("sites", "Site")
|
|
||||||
Site.objects.update_or_create(
|
|
||||||
id=settings.SITE_ID,
|
|
||||||
defaults={
|
|
||||||
"domain": "example.com",
|
|
||||||
"name": "example.com"
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('sites', '0001_initial'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.RunPython(update_site_forward, update_site_backward),
|
|
||||||
]
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
from __future__ import unicode_literals
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
import django.contrib.sites.models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('sites', '0002_set_site_domain_and_name'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AlterModelManagers(
|
|
||||||
name='site',
|
|
||||||
managers=[
|
|
||||||
('objects', django.contrib.sites.models.SiteManager()),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
.alert-debug {
|
|
||||||
background-color: #fff;
|
|
||||||
border-color: #d6e9c6;
|
|
||||||
color: #000; }
|
|
||||||
|
|
||||||
.alert-error {
|
|
||||||
background-color: #f2dede;
|
|
||||||
border-color: #eed3d7;
|
|
||||||
color: #b94a48; }
|
|
||||||
|
|
||||||
@media (max-width: 47.9em) {
|
|
||||||
.navbar-nav .nav-item {
|
|
||||||
display: inline-block;
|
|
||||||
float: none;
|
|
||||||
width: 100%; }
|
|
||||||
.navbar-nav .nav-item + .nav-item {
|
|
||||||
margin-left: 0; }
|
|
||||||
.nav.navbar-nav.pull-right {
|
|
||||||
float: none !important; } }
|
|
||||||
|
|
||||||
[hidden][style="display: block;"] {
|
|
||||||
display: block !important; }
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 8.2 KiB |
|
|
@ -1 +0,0 @@
|
||||||
/* Project specific Javascript goes here. */
|
|
||||||
|
|
@ -1,51 +0,0 @@
|
||||||
// project specific CSS goes here
|
|
||||||
|
|
||||||
// Alert colors
|
|
||||||
|
|
||||||
$white: #fff;
|
|
||||||
$mint-green: #d6e9c6;
|
|
||||||
$black: #000;
|
|
||||||
$pink: #f2dede;
|
|
||||||
$dark-pink: #eed3d7;
|
|
||||||
$red: #b94a48;
|
|
||||||
|
|
||||||
// bootstrap alert CSS, translated to the django-standard levels of
|
|
||||||
// debug, info, success, warning, error
|
|
||||||
|
|
||||||
.alert-debug {
|
|
||||||
background-color: $white;
|
|
||||||
border-color: $mint-green;
|
|
||||||
color: $black;
|
|
||||||
}
|
|
||||||
|
|
||||||
.alert-error {
|
|
||||||
background-color: $pink;
|
|
||||||
border-color: $dark-pink;
|
|
||||||
color: $red;
|
|
||||||
}
|
|
||||||
|
|
||||||
// This is a fix for the bootstrap4 alpha release
|
|
||||||
|
|
||||||
@media (max-width: 47.9em) {
|
|
||||||
.navbar-nav .nav-item {
|
|
||||||
display: inline-block;
|
|
||||||
float: none;
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.navbar-nav .nav-item + .nav-item {
|
|
||||||
margin-left: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav.navbar-nav.pull-right {
|
|
||||||
float: none !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Display django-debug-toolbar.
|
|
||||||
// See https://github.com/django-debug-toolbar/django-debug-toolbar/issues/742
|
|
||||||
// and https://github.com/pydanny/cookiecutter-django/issues/317
|
|
||||||
|
|
||||||
[hidden][style="display: block;"] {
|
|
||||||
display: block !important;
|
|
||||||
}
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
{% extends "base.html" %}
|
|
||||||
|
|
||||||
{% block title %}Page Not found{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<h1>Page Not found</h1>
|
|
||||||
|
|
||||||
<p>This is not the page you were looking for.</p>
|
|
||||||
{% endblock content %}
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
{% extends "base.html" %}
|
|
||||||
|
|
||||||
{% block title %}Server Error{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<h1>Error</h1>
|
|
||||||
|
|
||||||
<h3>Sorry about that, it looks like something went wrong.</h3>
|
|
||||||
|
|
||||||
<p>
|
|
||||||
We track these errors automatically, but if the problem persists feel free
|
|
||||||
to contact us. In the meantime, try refreshing.
|
|
||||||
</p>
|
|
||||||
{% endblock content %}
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
{% extends "base.html" %}
|
|
||||||
|
|
||||||
{% block title %}
|
|
||||||
{% block head_title %}
|
|
||||||
{% endblock head_title %}
|
|
||||||
{% endblock title %}
|
|
||||||
|
|
@ -1,76 +0,0 @@
|
||||||
{% extends "account/base.html" %}
|
|
||||||
{% block navbar_class-users:detail %}active{% endblock %}
|
|
||||||
|
|
||||||
{% load i18n %}
|
|
||||||
{% load crispy_forms_tags %}
|
|
||||||
|
|
||||||
{% block head_title %}{% trans "Account" %}{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-5">
|
|
||||||
<h2>{% trans "E-mail Addresses" %}</h2>
|
|
||||||
{% if user.emailaddress_set.all %}
|
|
||||||
<p>{% trans 'The following e-mail addresses are associated with your account:' %}</p>
|
|
||||||
<form action="{% url 'account_email' %}" class="email_list" method="post">
|
|
||||||
{% csrf_token %}
|
|
||||||
<fieldset class="blockLabels">
|
|
||||||
{% for emailaddress in user.emailaddress_set.all %}
|
|
||||||
<div class="ctrlHolder">
|
|
||||||
<label for="email_radio_{{ forloop.counter }}" class="{% if emailaddress.primary %}primary_email{% endif %}">
|
|
||||||
<input id="email_radio_{{ forloop.counter }}" type="radio" name="email" {% if emailaddress.primary %}checked="checked"{% endif %} value="{{ emailaddress.email }}"/>
|
|
||||||
{{ emailaddress.email }}
|
|
||||||
{% if emailaddress.verified %}
|
|
||||||
<span class="verified">{% trans "Verified" %}</span>
|
|
||||||
{% else %}
|
|
||||||
<span class="unverified">{% trans "Unverified" %}</span>
|
|
||||||
{% endif %}
|
|
||||||
{% if emailaddress.primary %}
|
|
||||||
<span class="primary">{% trans "Primary" %}</span>
|
|
||||||
{% endif %}
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
{% endfor %}
|
|
||||||
|
|
||||||
<div class="btn-group" role="group">
|
|
||||||
<input class="btn btn-primary" type="submit" value="{% trans 'Make Primary' %}" name="action_primary" />
|
|
||||||
<input class="btn btn-success" type="submit" value="{% trans 'Re-send Verification' %}" name="action_send" />
|
|
||||||
<input class="btn btn-danger" type="submit" value="{% trans 'Remove' %}" name="action_remove" />
|
|
||||||
</div>
|
|
||||||
</fieldset>
|
|
||||||
</form>
|
|
||||||
{% else %}
|
|
||||||
<p>
|
|
||||||
<strong>{% trans 'Warning:'%}</strong>
|
|
||||||
{% blocktrans %}
|
|
||||||
You currently do not have any e-mail address set up. You should
|
|
||||||
really add an e-mail address so you can receive notifications,
|
|
||||||
reset your password, etc.
|
|
||||||
{% endblocktrans %}
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
<h2>{% trans "Add E-mail Address" %}</h2>
|
|
||||||
<form method="post" action="." class="add_email">
|
|
||||||
{% csrf_token %}
|
|
||||||
{{ form|crispy }}
|
|
||||||
<button class="btn btn-primary" name="action_add" type="submit">{% trans "Add E-mail" %}</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block extra_body %}
|
|
||||||
<script type="text/javascript">
|
|
||||||
(function() {
|
|
||||||
var message = "{% trans 'Do you really want to remove the selected e-mail address?' %}";
|
|
||||||
var actions = document.getElementsByName('action_remove');
|
|
||||||
if (actions.length) {
|
|
||||||
actions[0].addEventListener("click", function(e) {
|
|
||||||
if (! confirm(message)) {
|
|
||||||
e.preventDefault();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
})();
|
|
||||||
</script>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
{% extends "account/base.html" %}
|
|
||||||
|
|
||||||
{% load i18n %}
|
|
||||||
{% load account %}
|
|
||||||
|
|
||||||
{% block head_title %}{% trans "Confirm E-mail Address" %}{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-xs-12">
|
|
||||||
<h2>{% trans "Confirm E-mail Address" %}</h2>
|
|
||||||
{% if confirmation %}
|
|
||||||
{% user_display confirmation.email_address.user as user_display %}
|
|
||||||
<p>
|
|
||||||
{% blocktrans with confirmation.email_address.email as email %}
|
|
||||||
Please confirm that <a href="mailto:{{ email }}">{{ email }}</a>
|
|
||||||
is an e-mail address for user {{ user_display }}.
|
|
||||||
{% endblocktrans %}
|
|
||||||
</p>
|
|
||||||
<form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
|
|
||||||
{% csrf_token %}
|
|
||||||
<input class="btn btn-primary" type="submit" value="{% trans 'Confirm' %}" />
|
|
||||||
</form>
|
|
||||||
{% else %}
|
|
||||||
{% url 'account_email' as email_url %}
|
|
||||||
<p>
|
|
||||||
{% blocktrans %}
|
|
||||||
This e-mail confirmation link expired or is invalid. Please
|
|
||||||
<a href="{{ email_url }}">issue a new e-mail confirmation request</a>.
|
|
||||||
{% endblocktrans %}
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
{% extends "account/base.html" %}
|
|
||||||
|
|
||||||
{% load i18n %}
|
|
||||||
{% load account %}
|
|
||||||
|
|
||||||
{% block head_title %}{% trans "Confirm E-mail Address" %}{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-xs-12">
|
|
||||||
<h2>{% trans "Confirm E-mail Address" %}</h2>
|
|
||||||
{% user_display email_address.user as user_display %}
|
|
||||||
<p>
|
|
||||||
{% blocktrans with email_address.email as email %}
|
|
||||||
You have confirmed that <a href="mailto:{{ email }}">{{ email }}</a>
|
|
||||||
is an e-mail address for user {{ user_display }}.
|
|
||||||
{% endblocktrans %}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
{% extends "account/base.html" %}
|
|
||||||
{% block navbar_class-account_login %}active{% endblock %}
|
|
||||||
|
|
||||||
{% load i18n %}
|
|
||||||
{% load account %}
|
|
||||||
{% load crispy_forms_tags %}
|
|
||||||
|
|
||||||
{% block head_title %}{% trans "Sign In" %}{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-5">
|
|
||||||
<h2>{% trans "Sign In" %}</h2>
|
|
||||||
<form class="login" method="POST" action="{% url 'account_login' %}">
|
|
||||||
{% csrf_token %}
|
|
||||||
{{ form|crispy }}
|
|
||||||
{% if redirect_field_value %}
|
|
||||||
<input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
|
|
||||||
{% endif %}
|
|
||||||
<button id="sign-in-button" class="btn btn-primary" type="submit">{% trans "Sign In" %}</button>
|
|
||||||
<a class="button secondaryAction" href="{% url 'account_reset_password' %}">{% trans "Forgot Password?" %}</a>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
{% extends "account/base.html" %}
|
|
||||||
{% block navbar_class-account_logout %}active{% endblock %}
|
|
||||||
|
|
||||||
{% load i18n %}
|
|
||||||
|
|
||||||
{% block head_title %}{% trans "Sign Out" %}{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-5">
|
|
||||||
<h2>{% trans "Sign Out" %}</h2>
|
|
||||||
<p>{% trans 'Are you sure you want to sign out?' %}</p>
|
|
||||||
<form method="post" action="{% url 'account_logout' %}">
|
|
||||||
{% csrf_token %}
|
|
||||||
{% if redirect_field_value %}
|
|
||||||
<input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}"/>
|
|
||||||
{% endif %}
|
|
||||||
<button class="btn btn-danger" type="submit">{% trans 'Sign Out' %}</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
{% extends "account/base.html" %}
|
|
||||||
|
|
||||||
{% load i18n %}
|
|
||||||
{% load crispy_forms_tags %}
|
|
||||||
{% block head_title %}{% trans "Change Password" %}{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-5">
|
|
||||||
<h2>{% trans "Change Password" %}</h2>
|
|
||||||
<form method="POST" action="./" class="password_change">
|
|
||||||
{% csrf_token %}
|
|
||||||
{{ form|crispy }}
|
|
||||||
<button class="btn btn-primary" type="submit" name="action">{% trans "Change Password" %}</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,38 +0,0 @@
|
||||||
{% extends "account/base.html" %}
|
|
||||||
|
|
||||||
{% load i18n %}
|
|
||||||
{% load account %}
|
|
||||||
{% load crispy_forms_tags %}
|
|
||||||
|
|
||||||
{% block head_title %}{% trans "Password Reset" %}{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-5">
|
|
||||||
<h2>{% trans "Password Reset" %}</h2>
|
|
||||||
{% if user.is_authenticated %}
|
|
||||||
{% include "account/snippets/already_logged_in.html" %}
|
|
||||||
{% endif %}
|
|
||||||
<p>
|
|
||||||
{% trans "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}
|
|
||||||
</p>
|
|
||||||
<form method="POST" action="./" class="password_reset">
|
|
||||||
{% csrf_token %}
|
|
||||||
{{ form|crispy }}
|
|
||||||
<button class="btn btn-primary" type="submit">{% trans "Reset My Password" %}</button>
|
|
||||||
</form>
|
|
||||||
<p>
|
|
||||||
{% blocktrans %}
|
|
||||||
Please contact us if you have any trouble resetting your password.
|
|
||||||
{% endblocktrans %}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block javascript %}
|
|
||||||
{{ block.super }}
|
|
||||||
<script>
|
|
||||||
$("#id_email").focus();
|
|
||||||
</script>
|
|
||||||
{% endblock javascript %}
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
{% extends "account/base.html" %}
|
|
||||||
|
|
||||||
{% load i18n %}
|
|
||||||
{% load account %}
|
|
||||||
|
|
||||||
{% block head_title %}{% trans "Password Reset" %}{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-xs-12">
|
|
||||||
<h2>{% trans "Password Reset" %}</h2>
|
|
||||||
{% if user.is_authenticated %}
|
|
||||||
{% include "account/snippets/already_logged_in.html" %}
|
|
||||||
{% endif %}
|
|
||||||
<p>
|
|
||||||
{% blocktrans %}
|
|
||||||
We have sent you an e-mail. Please contact us if you do not
|
|
||||||
receive it within a few minutes.
|
|
||||||
{% endblocktrans %}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,40 +0,0 @@
|
||||||
{% extends "account/base.html" %}
|
|
||||||
|
|
||||||
{% load i18n %}
|
|
||||||
{% load crispy_forms_tags %}
|
|
||||||
|
|
||||||
{% block head_title %}{% trans "Change Password" %}{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-xs-12">
|
|
||||||
<h2>
|
|
||||||
{% if token_fail %}
|
|
||||||
{% trans "Bad Token" %}
|
|
||||||
{% else %}
|
|
||||||
{% trans "Change Password" %}
|
|
||||||
{% endif %}
|
|
||||||
</h2>
|
|
||||||
{% if token_fail %}
|
|
||||||
{% url 'account_reset_password' as passwd_reset_url %}
|
|
||||||
<p>
|
|
||||||
{% blocktrans %}
|
|
||||||
The password reset link was invalid, possibly because it has already
|
|
||||||
been used. Please request a <a href="{{ passwd_reset_url }}">new
|
|
||||||
password reset</a>.
|
|
||||||
{% endblocktrans %}
|
|
||||||
</p>
|
|
||||||
{% else %}
|
|
||||||
{% if form %}
|
|
||||||
<form method="POST" action="./">
|
|
||||||
{% csrf_token %}
|
|
||||||
{{ form|crispy }}
|
|
||||||
<button class="btn btn-primary" type="submit" name="action">{% trans "change password" %}</button>
|
|
||||||
</form>
|
|
||||||
{% else %}
|
|
||||||
<p>{% trans 'Your password is now changed.' %}</p>
|
|
||||||
{% endif %}
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
{% extends "account/base.html" %}
|
|
||||||
|
|
||||||
{% load i18n %}
|
|
||||||
{% block head_title %}{% trans "Change Password" %}{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-5">
|
|
||||||
<h2>{% trans "Change Password" %}</h2>
|
|
||||||
<p>{% trans 'Your password is now changed.' %}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
|
|
||||||
{% extends "account/base.html" %}
|
|
||||||
|
|
||||||
{% load i18n crispy_forms_tags %}
|
|
||||||
|
|
||||||
{% block head_title %}{% trans "Set Password" %}{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-5">
|
|
||||||
<h2>{% trans "Set Password" %}</h2>
|
|
||||||
<form method="POST" action="./" class="password_set">
|
|
||||||
{% csrf_token %}
|
|
||||||
{{ form|crispy }}
|
|
||||||
<input type="submit" name="action" value="{% trans "Set Password" %}"/>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
{% extends "account/base.html" %}
|
|
||||||
{% block navbar_class-account_signup %}active{% endblock %}
|
|
||||||
|
|
||||||
{% load i18n %}
|
|
||||||
{% load crispy_forms_tags %}
|
|
||||||
|
|
||||||
{% block title %}{% trans "Signup" %}{% endblock title %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-5">
|
|
||||||
<h1>{% trans "Sign Up" %}</h1>
|
|
||||||
<p>
|
|
||||||
{% blocktrans %}
|
|
||||||
Already have an account? Then please
|
|
||||||
<a href="{{ login_url }}">sign in</a>.
|
|
||||||
{% endblocktrans %}
|
|
||||||
</p>
|
|
||||||
<form class="signup" id="signup_form" method="post" action="{% url 'account_signup' %}">
|
|
||||||
{% csrf_token %}
|
|
||||||
{{ form|crispy }}
|
|
||||||
{% if redirect_field_value %}
|
|
||||||
<input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
|
|
||||||
{% endif %}
|
|
||||||
<button id="sign-up-button" class="btn btn-primary" type="submit">{% trans "Sign Up" %}</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock content %}
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
{% extends "account/base.html" %}
|
|
||||||
|
|
||||||
{% load i18n %}
|
|
||||||
|
|
||||||
{% block head_title %}{% trans "Sign Up Closed" %}{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-5">
|
|
||||||
<h2>{% trans "Sign Up Closed" %}</h2>
|
|
||||||
<p>{% trans "We are sorry, but the sign up is currently closed." %}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
{% extends "account/base.html" %}
|
|
||||||
|
|
||||||
{% load i18n %}
|
|
||||||
|
|
||||||
{% block head_title %}{% trans "Verify Your E-mail Address" %}{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-5">
|
|
||||||
<h2>{% trans "Verify Your E-mail Address" %}</h2>
|
|
||||||
<p>
|
|
||||||
{% blocktrans %}
|
|
||||||
We have sent an e-mail to <a href="mailto:{{ email }}">{{ email }}</a>
|
|
||||||
for verification. Follow the link provided to finalize the signup
|
|
||||||
process. Please contact us if you do not receive it within a few minutes.
|
|
||||||
{% endblocktrans %}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
{% extends "account/base.html" %}
|
|
||||||
|
|
||||||
{% load i18n %}
|
|
||||||
|
|
||||||
{% block head_title %}{% trans "Verify Your E-mail Address" %}{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-5">
|
|
||||||
<h2>{% trans "Verify Your E-mail Address" %}</h2>
|
|
||||||
{% url 'account_email' as email_url %}
|
|
||||||
<p>
|
|
||||||
{% blocktrans %}
|
|
||||||
This part of the site requires us to verify that you are who you claim
|
|
||||||
to be. For this purpose, we require that you verify ownership of your
|
|
||||||
e-mail address.
|
|
||||||
{% endblocktrans %}
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
{% blocktrans %}
|
|
||||||
We have sent an e-mail to you for verification. Please click on the
|
|
||||||
link inside this e-mail. Please contact us if you do not receive it
|
|
||||||
within a few minutes.
|
|
||||||
{% endblocktrans %}
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
{% blocktrans %}
|
|
||||||
<strong>Note:</strong> you can still <a href="{{ email_url }}">change
|
|
||||||
your e-mail address</a>.
|
|
||||||
{% endblocktrans %}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,99 +0,0 @@
|
||||||
{% load staticfiles %}
|
|
||||||
{% load i18n %}
|
|
||||||
|
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta http-equiv="x-ua-compatible" content="ie=edge">
|
|
||||||
<title>{% block title %}CCDB{% endblock title %}</title>
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<meta name="description" content="">
|
|
||||||
<meta name="author" content="">
|
|
||||||
|
|
||||||
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
|
|
||||||
<!--[if lt IE 9]>
|
|
||||||
<script src="https://html5shim.googlecode.com/svn/trunk/html5.js"></script>
|
|
||||||
<![endif]-->
|
|
||||||
|
|
||||||
{% block css %}
|
|
||||||
<link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/flatly/bootstrap.min.css" rel="stylesheet" integrity="sha256-sHwgyDk4CGNYom267UJX364ewnY4Bh55d53pxP5WDug= sha512-mkkeSf+MM3dyMWg3k9hcAttl7IVHe2BA1o/5xKLl4kBaP0bih7Mzz/DBy4y6cNZCHtE2tPgYBYH/KtEjOQYKxA==" crossorigin="anonymous">
|
|
||||||
<link href="{% static 'css/project.css' %}" rel="stylesheet">
|
|
||||||
{% endblock %}
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<div>
|
|
||||||
<nav class="navbar navbar-default navbar-static-top">
|
|
||||||
<div class="container-fluid">
|
|
||||||
<div class="navbar-header">
|
|
||||||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
|
|
||||||
<span class="sr-only">Toggle navigation</span>
|
|
||||||
<span class="icon-bar"></span>
|
|
||||||
<span class="icon-bar"></span>
|
|
||||||
<span class="icon-bar"></span>
|
|
||||||
</button>
|
|
||||||
<a class="navbar-brand" href="{% url 'home' %}">CCDB</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
|
||||||
<ul class="nav navbar-nav">
|
|
||||||
{% if request.user.is_authenticated %}
|
|
||||||
<li class="nav-item {% block navbar_class-projects %}{% endblock %}">
|
|
||||||
<a class="nav-link" href="{% url 'admin:index' %}">
|
|
||||||
{% trans "Admin" %}
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
{% endif %}
|
|
||||||
</ul>
|
|
||||||
<ul class="nav navbar-nav pull-right">
|
|
||||||
{% if request.user.is_authenticated %}
|
|
||||||
<li class="nav-item {% block navbar_class-users:detail %}{% endblock %}">
|
|
||||||
<a class="nav-link" href="{% url 'users:detail' request.user.username %}">
|
|
||||||
{% trans "My Profile" %}
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
<li class="nav-item {% block navbar_class-account_logout %}{% endblock %}">
|
|
||||||
<a class="nav-link" href="{% url 'account_logout' %}">
|
|
||||||
{% trans "Logout" %}
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
{% else %}
|
|
||||||
<li class="nav-item {% block navbar_class-account_signup %}{% endblock %}">
|
|
||||||
<a id="sign-up-link" class="nav-link" href="{% url 'account_signup' %}">
|
|
||||||
{% trans "Sign Up" %}
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
<li class="nav-item {% block navbar_class-account_login %}{% endblock %}">
|
|
||||||
<a id="log-in-link" class="nav-link" href="{% url 'account_login' %}">
|
|
||||||
{% trans "Log In" %}
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
{% endif %}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</nav>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="container">
|
|
||||||
{% if messages %}
|
|
||||||
{% for message in messages %}
|
|
||||||
<div class="alert {% if message.tags %}alert-{{ message.tags }}"{% endif %}>{{ message }}</div>
|
|
||||||
{% endfor %}
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<p>PLACEHOLDER</p>
|
|
||||||
{% endblock content %}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% block modal %}{% endblock modal %}
|
|
||||||
|
|
||||||
{% block javascript %}
|
|
||||||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
|
|
||||||
<script src="https://cdn.rawgit.com/twbs/bootstrap/v4-dev/dist/js/bootstrap.js"></script>
|
|
||||||
<script src="{% static 'js/project.js' %}"></script>
|
|
||||||
{% endblock javascript %}
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
@ -1,58 +0,0 @@
|
||||||
{% load querystring from django_tables2 %}
|
|
||||||
{% load title from django_tables2 %}
|
|
||||||
{% load trans blocktrans from i18n %}
|
|
||||||
{% load bootstrap3 %}
|
|
||||||
|
|
||||||
{% if table.page %}
|
|
||||||
<div class="table-container">
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% block table %}
|
|
||||||
<table class="table table-striped"{% if table.attrs %} {{ table.attrs.as_html }}{% endif %}>
|
|
||||||
{% block table.thead %}
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
{% for column in table.columns %}
|
|
||||||
{% if column.orderable %}
|
|
||||||
<th {{ column.attrs.th.as_html }}><a href="{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}">{{ column.header|title }}</a></th>
|
|
||||||
{% else %}
|
|
||||||
<th {{ column.attrs.th.as_html }}>{{ column.header|title }}</th>
|
|
||||||
{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
{% endblock table.thead %}
|
|
||||||
{% block table.tbody %}
|
|
||||||
<tbody>
|
|
||||||
{% for row in table.page.object_list|default:table.rows %} {# support pagination #}
|
|
||||||
{% block table.tbody.row %}
|
|
||||||
<tr class="{% cycle "odd" "even" %}">
|
|
||||||
{% for column, cell in row.items %}
|
|
||||||
<td {{ column.attrs.td.as_html }}>{{ cell }}</td>
|
|
||||||
{% endfor %}
|
|
||||||
</tr>
|
|
||||||
{% endblock table.tbody.row %}
|
|
||||||
{% empty %}
|
|
||||||
{% if table.empty_text %}
|
|
||||||
{% block table.tbody.empty_text %}
|
|
||||||
<tr><td colspan="{{ table.columns|length }}">{{ table.empty_text }}</td></tr>
|
|
||||||
{% endblock table.tbody.empty_text %}
|
|
||||||
{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
</tbody>
|
|
||||||
{% endblock table.tbody %}
|
|
||||||
{% block table.tfoot %}
|
|
||||||
<tfoot></tfoot>
|
|
||||||
{% endblock table.tfoot %}
|
|
||||||
</table>
|
|
||||||
{% endblock table %}
|
|
||||||
|
|
||||||
{% if table.page %}
|
|
||||||
{% block pagination %}
|
|
||||||
{% bootstrap_pagination table.page url=request.get_full_path %}
|
|
||||||
{% endblock pagination %}
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% if table.page %}
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
{% extends "base.html" %}
|
|
||||||
{% block navbar_class-about %}active{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<h1>About</h1>
|
|
||||||
{% endblock content %}
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
{% extends "base.html" %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<h1>CCDB</h1>
|
|
||||||
|
|
||||||
<p>This page will have overview data.</p>
|
|
||||||
{% endblock content %}
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
{% extends "base.html" %}
|
|
||||||
{% block navbar_class-users:detail %}active{% endblock %}
|
|
||||||
{% load static %}
|
|
||||||
|
|
||||||
{% block title %}User: {{ object.username }}{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-12">
|
|
||||||
<h1>{{ object.username }}</h1>
|
|
||||||
{% if object.name %}
|
|
||||||
<p>{{ object.name }}</p>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% if object == request.user %}
|
|
||||||
<!-- Action buttons -->
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-12 ">
|
|
||||||
<a class="btn btn-primary" href="{% url 'users:update' username=request.user.username %}">My Info</a>
|
|
||||||
<a class="btn btn-primary" href="{% url 'account_email' %}">E-Mail</a>
|
|
||||||
<!-- Your Stuff: Custom user template urls -->
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<!-- End Action buttons -->
|
|
||||||
{% endif %}
|
|
||||||
{% endblock content %}
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
{% extends "base.html" %}
|
|
||||||
{% block navbar_class-users:detail %}active{% endblock %}
|
|
||||||
{% load crispy_forms_tags %}
|
|
||||||
{% load static %}
|
|
||||||
|
|
||||||
{% block title %}{{ user.username }}{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-sm-12">
|
|
||||||
<h1>{{ user.username }}</h1>
|
|
||||||
<form class="form" method="POST" action="">
|
|
||||||
{% csrf_token %}
|
|
||||||
{{ form|crispy }}
|
|
||||||
<input class="btn btn-primary" type="submit" value="Submit" />
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
{% extends "base.html" %}
|
|
||||||
{% load static %}{% load i18n %}
|
|
||||||
{% block title %}Members{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<h2>Users</h2>
|
|
||||||
<div class="list-group">
|
|
||||||
{% for user in user_list %}
|
|
||||||
<a href="{% url 'users:detail' user.username %}" class="list-group-item">
|
|
||||||
<h4 class="list-group-item-heading">{{ user.username }}</h4>
|
|
||||||
</a>
|
|
||||||
{% endfor %}
|
|
||||||
</div>
|
|
||||||
{% endblock content %}
|
|
||||||
|
|
@ -1,6 +1,3 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
from __future__ import absolute_import, unicode_literals
|
|
||||||
|
|
||||||
from django import forms
|
from django import forms
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from django.contrib.auth.admin import UserAdmin as AuthUserAdmin
|
from django.contrib.auth.admin import UserAdmin as AuthUserAdmin
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,7 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
from django.contrib.auth.models import AbstractUser
|
from django.contrib.auth.models import AbstractUser
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.conf import settings
|
|
||||||
|
|
||||||
import pytz
|
import pytz
|
||||||
|
|
||||||
|
|
@ -11,7 +9,8 @@ import pytz
|
||||||
class User(AbstractUser):
|
class User(AbstractUser):
|
||||||
name = models.CharField(_("Name of User"), blank=True, max_length=255)
|
name = models.CharField(_("Name of User"), blank=True, max_length=255)
|
||||||
timezone = models.CharField(_("Current Timezone"), max_length=255,
|
timezone = models.CharField(_("Current Timezone"), max_length=255,
|
||||||
default="UTC", choices=[(x, x) for x in pytz.common_timezones],
|
default="UTC",
|
||||||
|
choices=[(x, x) for x in pytz.common_timezones],
|
||||||
blank=False)
|
blank=False)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
|
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
import factory
|
|
||||||
|
|
||||||
|
|
||||||
class UserFactory(factory.django.DjangoModelFactory):
|
|
||||||
username = factory.Sequence(lambda n: 'user-{0}'.format(n))
|
|
||||||
email = factory.Sequence(lambda n: 'user-{0}@example.com'.format(n))
|
|
||||||
password = factory.PostGenerationMethodCall('set_password', 'password')
|
|
||||||
|
|
||||||
class Meta:
|
|
||||||
model = 'users.User'
|
|
||||||
django_get_or_create = ('username', )
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
from test_plus.test import TestCase
|
|
||||||
|
|
||||||
from ..admin import MyUserCreationForm
|
|
||||||
|
|
||||||
|
|
||||||
class TestMyUserCreationForm(TestCase):
|
|
||||||
def setUp(self):
|
|
||||||
self.user = self.make_user()
|
|
||||||
|
|
||||||
def test_clean_username_success(self):
|
|
||||||
# Instantiate the form with a new username
|
|
||||||
form = MyUserCreationForm({
|
|
||||||
'username': 'alamode',
|
|
||||||
'password1': '123456',
|
|
||||||
'password2': '123456',
|
|
||||||
})
|
|
||||||
# Run is_valid() to trigger the validation
|
|
||||||
valid = form.is_valid()
|
|
||||||
self.assertTrue(valid)
|
|
||||||
|
|
||||||
# Run the actual clean_username method
|
|
||||||
username = form.clean_username()
|
|
||||||
self.assertEqual('alamode', username)
|
|
||||||
|
|
||||||
def test_clean_username_false(self):
|
|
||||||
# Instantiate the form with the same username as self.user
|
|
||||||
form = MyUserCreationForm({
|
|
||||||
'username': self.user.username,
|
|
||||||
'password1': '123456',
|
|
||||||
'password2': '123456',
|
|
||||||
})
|
|
||||||
# Run is_valid() to trigger the validation, which is going to fail
|
|
||||||
# because the username is already taken
|
|
||||||
valid = form.is_valid()
|
|
||||||
self.assertFalse(valid)
|
|
||||||
|
|
||||||
# The form.errors dict should contain a single error called 'username'
|
|
||||||
self.assertTrue(len(form.errors) == 1)
|
|
||||||
self.assertTrue('username' in form.errors)
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
from test_plus.test import TestCase
|
|
||||||
|
|
||||||
|
|
||||||
class TestUser(TestCase):
|
|
||||||
def setUp(self):
|
|
||||||
self.user = self.make_user()
|
|
||||||
|
|
||||||
def test__str__(self):
|
|
||||||
self.assertEqual(
|
|
||||||
self.user.__str__(),
|
|
||||||
"testuser" # This is the default username for self.make_user()
|
|
||||||
)
|
|
||||||
|
|
||||||
def test_get_absolute_url(self):
|
|
||||||
self.assertEqual(
|
|
||||||
self.user.get_absolute_url(),
|
|
||||||
'/users/testuser/'
|
|
||||||
)
|
|
||||||
|
|
@ -1,66 +0,0 @@
|
||||||
from django.test import RequestFactory
|
|
||||||
|
|
||||||
from test_plus.test import TestCase
|
|
||||||
|
|
||||||
from ..views import (
|
|
||||||
UserRedirectView,
|
|
||||||
UserUpdateView
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class BaseUserTestCase(TestCase):
|
|
||||||
def setUp(self):
|
|
||||||
self.user = self.make_user()
|
|
||||||
self.factory = RequestFactory()
|
|
||||||
|
|
||||||
|
|
||||||
class TestUserRedirectView(BaseUserTestCase):
|
|
||||||
def test_get_redirect_url(self):
|
|
||||||
# Instantiate the view directly. Never do this outside a test!
|
|
||||||
view = UserRedirectView()
|
|
||||||
# Generate a fake request
|
|
||||||
request = self.factory.get('/fake-url')
|
|
||||||
# Attach the user to the request
|
|
||||||
request.user = self.user
|
|
||||||
# Attach the request to the view
|
|
||||||
view.request = request
|
|
||||||
# Expect: '/users/testuser/', as that is the default username for
|
|
||||||
# self.make_user()
|
|
||||||
self.assertEqual(
|
|
||||||
view.get_redirect_url(),
|
|
||||||
'/users/testuser/'
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class TestUserUpdateView(BaseUserTestCase):
|
|
||||||
def setUp(self):
|
|
||||||
# call BaseUserTestCase.setUp()
|
|
||||||
super(TestUserUpdateView, self).setUp()
|
|
||||||
# Instantiate the view directly. Never do this outside a test!
|
|
||||||
self.view = UserUpdateView()
|
|
||||||
# Generate a fake request
|
|
||||||
request = self.factory.get('/fake-url')
|
|
||||||
# Attach the user to the request
|
|
||||||
request.user = self.user
|
|
||||||
# Attach the request to the view
|
|
||||||
self.view.request = request
|
|
||||||
|
|
||||||
def test_get_success_url(self):
|
|
||||||
# Expect: '/users/testuser/', as that is the default username for
|
|
||||||
# self.make_user()
|
|
||||||
self.assertEqual(
|
|
||||||
self.view.get_success_url(),
|
|
||||||
'/users/testuser/'
|
|
||||||
)
|
|
||||||
|
|
||||||
# TODO: write this test
|
|
||||||
# def test_get_redirected(self):
|
|
||||||
# Expect '/users/testuser01/' to redirect, because that isn't the
|
|
||||||
# currently logged in user
|
|
||||||
|
|
||||||
def test_get_object(self):
|
|
||||||
# Expect: self.user, as that is the request's user object
|
|
||||||
self.assertEqual(
|
|
||||||
self.view.get_object(),
|
|
||||||
self.user
|
|
||||||
)
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
from __future__ import absolute_import, unicode_literals
|
|
||||||
|
|
||||||
from django.conf.urls import url
|
|
||||||
|
|
||||||
from . import views
|
|
||||||
|
|
||||||
|
|
||||||
urlpatterns = [
|
|
||||||
url(regex=r'^$', view=views.UserListView.as_view(), name='list'),
|
|
||||||
url(regex=r'^redirect/$', view=views.UserRedirectView.as_view(), name='redirect'),
|
|
||||||
url(regex=r'^(?P<username>[\w.@+-]+)/$', view=views.UserDetailView.as_view(), name='detail'),
|
|
||||||
url(regex=r'^(?P<username>[\w.@+-]+)/update/$', view=views.UserUpdateView.as_view(), name='update'),
|
|
||||||
]
|
|
||||||
|
|
@ -1,51 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
from __future__ import absolute_import, unicode_literals
|
|
||||||
|
|
||||||
from django.core.urlresolvers import reverse
|
|
||||||
from django.views.generic import DetailView, ListView, RedirectView, UpdateView
|
|
||||||
from django.shortcuts import redirect
|
|
||||||
|
|
||||||
from braces.views import LoginRequiredMixin
|
|
||||||
|
|
||||||
from .models import User
|
|
||||||
|
|
||||||
|
|
||||||
class UserDetailView(LoginRequiredMixin, DetailView):
|
|
||||||
model = User
|
|
||||||
# These next two lines tell the view to index lookups by username
|
|
||||||
slug_field = "username"
|
|
||||||
slug_url_kwarg = "username"
|
|
||||||
|
|
||||||
|
|
||||||
class UserRedirectView(LoginRequiredMixin, RedirectView):
|
|
||||||
permanent = False
|
|
||||||
|
|
||||||
def get_redirect_url(self):
|
|
||||||
return reverse("users:detail",
|
|
||||||
kwargs={"username": self.request.user.username})
|
|
||||||
|
|
||||||
|
|
||||||
class UserUpdateView(LoginRequiredMixin, UpdateView):
|
|
||||||
fields = ['name', 'timezone']
|
|
||||||
model = User
|
|
||||||
|
|
||||||
def dispatch(self, request, *args, **kwargs):
|
|
||||||
if request.user.username != kwargs.pop("username", None):
|
|
||||||
return redirect(reverse("users:detail",
|
|
||||||
kwargs={"username": request.user.username}))
|
|
||||||
return super(UserUpdateView, self).dispatch(request, *args, **kwargs)
|
|
||||||
|
|
||||||
def get_success_url(self):
|
|
||||||
return reverse("users:detail",
|
|
||||||
kwargs={"username": self.request.user.username})
|
|
||||||
|
|
||||||
def get_object(self):
|
|
||||||
# Only get the User record for the user making the request
|
|
||||||
return User.objects.get(username=self.request.user.username)
|
|
||||||
|
|
||||||
|
|
||||||
class UserListView(LoginRequiredMixin, ListView):
|
|
||||||
model = User
|
|
||||||
# These next two lines tell the view to index lookups by username
|
|
||||||
slug_field = "username"
|
|
||||||
slug_url_kwarg = "username"
|
|
||||||
|
|
@ -13,24 +13,21 @@ env = environ.Env()
|
||||||
# APP CONFIGURATION
|
# APP CONFIGURATION
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
DJANGO_APPS = (
|
DJANGO_APPS = (
|
||||||
# Default Django apps:
|
|
||||||
'django.contrib.auth',
|
'django.contrib.auth',
|
||||||
'django.contrib.contenttypes',
|
'django.contrib.contenttypes',
|
||||||
'django.contrib.sessions',
|
'django.contrib.sessions',
|
||||||
'django.contrib.sites',
|
'django.contrib.sites',
|
||||||
'django.contrib.messages',
|
'django.contrib.messages',
|
||||||
'django.contrib.staticfiles',
|
'django.contrib.staticfiles',
|
||||||
|
|
||||||
# Admin
|
|
||||||
'grappelli',
|
'grappelli',
|
||||||
'django.contrib.admin',
|
'django.contrib.admin',
|
||||||
)
|
)
|
||||||
THIRD_PARTY_APPS = (
|
THIRD_PARTY_APPS = (
|
||||||
'crispy_forms', # Form layouts
|
'crispy_forms',
|
||||||
'allauth', # registration
|
'allauth',
|
||||||
'allauth.account', # registration
|
'allauth.account',
|
||||||
'bootstrap3', # bootstrappin'
|
'bootstrap3',
|
||||||
'django_tables2', # data grids
|
'django_tables2',
|
||||||
)
|
)
|
||||||
|
|
||||||
# Apps specific for this project go here.
|
# Apps specific for this project go here.
|
||||||
|
|
@ -64,12 +61,6 @@ MIDDLEWARE_CLASSES = (
|
||||||
'ccdb.users.middleware.TimezoneMiddleware',
|
'ccdb.users.middleware.TimezoneMiddleware',
|
||||||
)
|
)
|
||||||
|
|
||||||
# MIGRATIONS CONFIGURATION
|
|
||||||
# ------------------------------------------------------------------------------
|
|
||||||
MIGRATION_MODULES = {
|
|
||||||
'sites': 'ccdb.contrib.sites.migrations'
|
|
||||||
}
|
|
||||||
|
|
||||||
# DEBUG
|
# DEBUG
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
# See: https://docs.djangoproject.com/en/dev/ref/settings/#debug
|
# See: https://docs.djangoproject.com/en/dev/ref/settings/#debug
|
||||||
|
|
@ -125,9 +116,6 @@ LOCALE_PATHS = [
|
||||||
'locale',
|
'locale',
|
||||||
]
|
]
|
||||||
|
|
||||||
# See: https://docs.djangoproject.com/en/dev/ref/settings/#site-id
|
|
||||||
SITE_ID = 1
|
|
||||||
|
|
||||||
# See: https://docs.djangoproject.com/en/dev/ref/settings/#use-i18n
|
# See: https://docs.djangoproject.com/en/dev/ref/settings/#use-i18n
|
||||||
USE_I18N = True
|
USE_I18N = True
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,21 +2,16 @@ from django.conf import settings
|
||||||
from django.conf.urls import include, url
|
from django.conf.urls import include, url
|
||||||
from django.conf.urls.static import static
|
from django.conf.urls.static import static
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from django.views.generic import TemplateView
|
from django.views.generic import RedirectView
|
||||||
from django.views import defaults as default_views
|
from django.views import defaults as default_views
|
||||||
|
from django.core.urlresolvers import reverse_lazy
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
url(r'^$', TemplateView.as_view(template_name='pages/home.html'), name="home"),
|
|
||||||
url(r'^about/$', TemplateView.as_view(template_name='pages/about.html'), name="about"),
|
|
||||||
|
|
||||||
# Django Admin, use {% url 'admin:index' %}
|
|
||||||
url(r'^grappelli/', include('grappelli.urls')),
|
url(r'^grappelli/', include('grappelli.urls')),
|
||||||
url(settings.ADMIN_URL, include(admin.site.urls)),
|
url(settings.ADMIN_URL, include(admin.site.urls)),
|
||||||
|
url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
|
||||||
# User management
|
# url(r'^api/', include('ccdb.api.urls', namespace='api')),
|
||||||
url(r'^users/', include("ccdb.users.urls", namespace="users")),
|
url(r'^$', RedirectView.as_view(url=reverse_lazy('admin:index'), permanent=True)),
|
||||||
url(r'^accounts/', include('allauth.urls')),
|
|
||||||
|
|
||||||
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||||
|
|
||||||
if settings.DEBUG:
|
if settings.DEBUG:
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue