Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
radiopanik
panikdb
Commits
a6638edb
Commit
a6638edb
authored
Aug 30, 2013
by
fred
Browse files
add own user class
parent
a9260de3
Changes
6
Hide whitespace changes
Inline
Side-by-side
panikdb/aa/__init__.py
0 → 100644
View file @
a6638edb
from
models
import
User
panikdb/aa/admin.py
0 → 100644
View file @
a6638edb
from
django.contrib
import
admin
from
.models
import
User
class
UserAdmin
(
admin
.
ModelAdmin
):
pass
admin
.
site
.
register
(
User
,
UserAdmin
)
panikdb/aa/migrations/0001_initial.py
0 → 100644
View file @
a6638edb
# -*- coding: 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 'User'
db
.
create_table
(
u
'aa_user'
,
(
(
u
'id'
,
self
.
gf
(
'django.db.models.fields.AutoField'
)(
primary_key
=
True
)),
(
'password'
,
self
.
gf
(
'django.db.models.fields.CharField'
)(
max_length
=
128
)),
(
'last_login'
,
self
.
gf
(
'django.db.models.fields.DateTimeField'
)(
default
=
datetime
.
datetime
.
now
)),
(
'is_superuser'
,
self
.
gf
(
'django.db.models.fields.BooleanField'
)(
default
=
False
)),
(
'username'
,
self
.
gf
(
'django.db.models.fields.CharField'
)(
unique
=
True
,
max_length
=
30
)),
(
'first_name'
,
self
.
gf
(
'django.db.models.fields.CharField'
)(
max_length
=
30
,
blank
=
True
)),
(
'last_name'
,
self
.
gf
(
'django.db.models.fields.CharField'
)(
max_length
=
30
,
blank
=
True
)),
(
'email'
,
self
.
gf
(
'django.db.models.fields.EmailField'
)(
max_length
=
75
,
blank
=
True
)),
(
'is_staff'
,
self
.
gf
(
'django.db.models.fields.BooleanField'
)(
default
=
False
)),
(
'is_active'
,
self
.
gf
(
'django.db.models.fields.BooleanField'
)(
default
=
True
)),
(
'date_joined'
,
self
.
gf
(
'django.db.models.fields.DateTimeField'
)(
default
=
datetime
.
datetime
.
now
)),
))
db
.
send_create_signal
(
u
'aa'
,
[
'User'
])
# Adding M2M table for field groups on 'User'
m2m_table_name
=
db
.
shorten_name
(
u
'aa_user_groups'
)
db
.
create_table
(
m2m_table_name
,
(
(
'id'
,
models
.
AutoField
(
verbose_name
=
'ID'
,
primary_key
=
True
,
auto_created
=
True
)),
(
'user'
,
models
.
ForeignKey
(
orm
[
u
'aa.user'
],
null
=
False
)),
(
'group'
,
models
.
ForeignKey
(
orm
[
u
'auth.group'
],
null
=
False
))
))
db
.
create_unique
(
m2m_table_name
,
[
'user_id'
,
'group_id'
])
# Adding M2M table for field user_permissions on 'User'
m2m_table_name
=
db
.
shorten_name
(
u
'aa_user_user_permissions'
)
db
.
create_table
(
m2m_table_name
,
(
(
'id'
,
models
.
AutoField
(
verbose_name
=
'ID'
,
primary_key
=
True
,
auto_created
=
True
)),
(
'user'
,
models
.
ForeignKey
(
orm
[
u
'aa.user'
],
null
=
False
)),
(
'permission'
,
models
.
ForeignKey
(
orm
[
u
'auth.permission'
],
null
=
False
))
))
db
.
create_unique
(
m2m_table_name
,
[
'user_id'
,
'permission_id'
])
# Adding M2M table for field emissions on 'User'
m2m_table_name
=
db
.
shorten_name
(
u
'aa_user_emissions'
)
db
.
create_table
(
m2m_table_name
,
(
(
'id'
,
models
.
AutoField
(
verbose_name
=
'ID'
,
primary_key
=
True
,
auto_created
=
True
)),
(
'user'
,
models
.
ForeignKey
(
orm
[
u
'aa.user'
],
null
=
False
)),
(
'emission'
,
models
.
ForeignKey
(
orm
[
u
'emissions.emission'
],
null
=
False
))
))
db
.
create_unique
(
m2m_table_name
,
[
'user_id'
,
'emission_id'
])
def
backwards
(
self
,
orm
):
# Deleting model 'User'
db
.
delete_table
(
u
'aa_user'
)
# Removing M2M table for field groups on 'User'
db
.
delete_table
(
db
.
shorten_name
(
u
'aa_user_groups'
))
# Removing M2M table for field user_permissions on 'User'
db
.
delete_table
(
db
.
shorten_name
(
u
'aa_user_user_permissions'
))
# Removing M2M table for field emissions on 'User'
db
.
delete_table
(
db
.
shorten_name
(
u
'aa_user_emissions'
))
models
=
{
u
'aa.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'
}),
'emissions'
:
(
'django.db.models.fields.related.ManyToManyField'
,
[],
{
'to'
:
u
"orm['emissions.Emission']"
,
'symmetrical'
:
'False'
}),
'first_name'
:
(
'django.db.models.fields.CharField'
,
[],
{
'max_length'
:
'30'
,
'blank'
:
'True'
}),
'groups'
:
(
'django.db.models.fields.related.ManyToManyField'
,
[],
{
'to'
:
u
"orm['auth.Group']"
,
'symmetrical'
:
'False'
,
'blank'
:
'True'
}),
u
'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'
:
u
"orm['auth.Permission']"
,
'symmetrical'
:
'False'
,
'blank'
:
'True'
}),
'username'
:
(
'django.db.models.fields.CharField'
,
[],
{
'unique'
:
'True'
,
'max_length'
:
'30'
})
},
u
'auth.group'
:
{
'Meta'
:
{
'object_name'
:
'Group'
},
u
'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'
:
u
"orm['auth.Permission']"
,
'symmetrical'
:
'False'
,
'blank'
:
'True'
})
},
u
'auth.permission'
:
{
'Meta'
:
{
'ordering'
:
"(u'content_type__app_label', u'content_type__model', u'codename')"
,
'unique_together'
:
"((u'content_type', u'codename'),)"
,
'object_name'
:
'Permission'
},
'codename'
:
(
'django.db.models.fields.CharField'
,
[],
{
'max_length'
:
'100'
}),
'content_type'
:
(
'django.db.models.fields.related.ForeignKey'
,
[],
{
'to'
:
u
"orm['contenttypes.ContentType']"
}),
u
'id'
:
(
'django.db.models.fields.AutoField'
,
[],
{
'primary_key'
:
'True'
}),
'name'
:
(
'django.db.models.fields.CharField'
,
[],
{
'max_length'
:
'50'
})
},
u
'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'
}),
u
'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'
})
},
u
'emissions.category'
:
{
'Meta'
:
{
'object_name'
:
'Category'
},
u
'id'
:
(
'django.db.models.fields.AutoField'
,
[],
{
'primary_key'
:
'True'
}),
'title'
:
(
'django.db.models.fields.CharField'
,
[],
{
'max_length'
:
'50'
})
},
u
'emissions.emission'
:
{
'Meta'
:
{
'object_name'
:
'Emission'
},
'archived'
:
(
'django.db.models.fields.BooleanField'
,
[],
{
'default'
:
'False'
}),
'categories'
:
(
'django.db.models.fields.related.ManyToManyField'
,
[],
{
'to'
:
u
"orm['emissions.Category']"
,
'symmetrical'
:
'False'
}),
'description'
:
(
'ckeditor.fields.RichTextField'
,
[],
{
'null'
:
'True'
,
'blank'
:
'True'
}),
'duration'
:
(
'django.db.models.fields.IntegerField'
,
[],
{
'default'
:
'60'
}),
'email'
:
(
'django.db.models.fields.EmailField'
,
[],
{
'max_length'
:
'254'
,
'null'
:
'True'
,
'blank'
:
'True'
}),
u
'id'
:
(
'django.db.models.fields.AutoField'
,
[],
{
'primary_key'
:
'True'
}),
'image'
:
(
'django.db.models.fields.files.ImageField'
,
[],
{
'max_length'
:
'250'
,
'null'
:
'True'
,
'blank'
:
'True'
}),
'slug'
:
(
'django.db.models.fields.SlugField'
,
[],
{
'max_length'
:
'50'
}),
'text'
:
(
'ckeditor.fields.RichTextField'
,
[],
{
'null'
:
'True'
}),
'title'
:
(
'django.db.models.fields.CharField'
,
[],
{
'max_length'
:
'200'
}),
'website'
:
(
'django.db.models.fields.URLField'
,
[],
{
'max_length'
:
'200'
,
'null'
:
'True'
,
'blank'
:
'True'
})
}
}
complete_apps
=
[
'aa'
]
\ No newline at end of file
panikdb/aa/migrations/__init__.py
0 → 100644
View file @
a6638edb
panikdb/aa/models.py
0 → 100644
View file @
a6638edb
import
re
from
django.contrib.auth.models
import
AbstractUser
from
django.core
import
validators
from
django.db
import
models
from
..emissions.models
import
Emission
class
User
(
AbstractUser
):
emissions
=
models
.
ManyToManyField
(
Emission
)
panikdb/settings.py
View file @
a6638edb
...
...
@@ -127,6 +127,7 @@ INSTALLED_APPS = (
'haystack'
,
'taggit'
,
'panikdb.emissions'
,
'panikdb.aa'
,
)
# A sample logging configuration. The only tangible logging
...
...
@@ -176,6 +177,7 @@ HAYSTACK_CONNECTIONS = {
},
}
AUTH_USER_MODEL
=
'aa.User'
LOGIN_REDIRECT_URL
=
'/'
try
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment