Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Remove all old references to registration

  • Loading branch information...
commit b09cf5e1ea21294c56cc956853e619fd086a97b1 1 parent 77ff35a
@jj0hns0n jj0hns0n authored
View
71 geonode/migrations/registration/0001_initial.py
@@ -1,71 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
- def forwards(self, orm):
-
- # Adding model 'RegistrationProfile'
- db.create_table('registration_registrationprofile', (
- ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
- ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], unique=True)),
- ('activation_key', self.gf('django.db.models.fields.CharField')(max_length=40)),
- ))
- db.send_create_signal('registration', ['RegistrationProfile'])
-
-
- def backwards(self, orm):
-
- # Deleting model 'RegistrationProfile'
- db.delete_table('registration_registrationprofile')
-
-
- models = {
- 'auth.group': {
- 'Meta': {'object_name': 'Group'},
- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
- },
- 'auth.permission': {
- 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
- },
- 'auth.user': {
- 'Meta': {'object_name': 'User'},
- 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
- 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
- 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
- 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
- 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
- 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
- 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
- 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
- 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
- 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
- },
- 'contenttypes.contenttype': {
- 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
- },
- 'registration.registrationprofile': {
- 'Meta': {'object_name': 'RegistrationProfile'},
- 'activation_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'})
- }
- }
-
- complete_apps = ['registration']
View
0  geonode/migrations/registration/__init__.py
No changes.
View
3  geonode/people/forms.py
@@ -22,9 +22,10 @@
from geonode.layers.models import ContactRole
from django import forms
from django.utils.translation import ugettext_lazy as _
-from registration.forms import attrs_dict
import taggit
+# Ported in from django-registration
+attrs_dict = { 'class': 'required' }
class ForgotUsernameForm(forms.Form):
email = forms.EmailField(widget=forms.TextInput(attrs=dict(attrs_dict,
View
5 geonode/settings.py
@@ -291,14 +291,11 @@ def get_user_url(u):
# For South migrations
SOUTH_MIGRATION_MODULES = {
- 'registration': 'geonode.migrations.registration',
'avatar': 'geonode.migrations.avatar',
}
-# For django-profiles
+# Settings for Social Apps
AUTH_PROFILE_MODULE = 'people.Profile'
-
-# For django-registration
REGISTRATION_OPEN = False
#
View
4 geonode/templates/base_geonode.html
@@ -89,7 +89,7 @@
</label>
<button type="submit" class="btn pull-right">{% trans "Sign in" %}</button>
{% if REGISTRATION_OPEN %}
- <div>{% trans "Don't have an account yet?" %} <a href="{% url registration_register %}">{% trans "Register now" %}</a></div>
+ <div>{% trans "Don't have an account yet?" %} <a href="{% url account_signup %}">{% trans "Register now" %}</a></div>
{% endif %}
</form>
</li>
@@ -97,7 +97,7 @@
</li>
{% if REGISTRATION_OPEN %}
<li class="navbar-text">{% trans "or" %}</li>
- <li><a href="{% url registration_register %}">{% trans "Register" %}</a></li>
+ <li><a href="{% url registration_signup %}">{% trans "Register" %}</a></li>
{% endif %}
{% endif %}
</ul>
View
1  pavement.py
@@ -133,7 +133,6 @@ def upgradedb(options):
if version in ['1.1', '1.2']:
sh("python manage.py migrate maps 0001 --fake")
sh("python manage.py migrate avatar 0001 --fake")
- sh("python manage.py migrate registration 0001 --fake")
elif version is None:
print "Please specify your GeoNode version"
else:
Please sign in to comment.
Something went wrong with that request. Please try again.