yet another rename, from auth -> user -> student
--HG-- rename : user/__init__.py => student/__init__.py rename : user/migrations/0001_initial.py => student/migrations/0001_initial.py rename : user/migrations/0002_text_to_varchar_and_indexes.py => student/migrations/0002_text_to_varchar_and_indexes.py rename : user/migrations/__init__.py => student/migrations/__init__.py rename : user/models.py => student/models.py rename : user/tests.py => student/tests.py rename : user/views.py => student/views.py
This commit is contained in:
@@ -7,7 +7,7 @@ from mako.lookup import TemplateLookup
|
||||
|
||||
try: # This lets us do __name__ == ='__main__'
|
||||
from django.conf import settings
|
||||
from user.models import UserProfile
|
||||
from student.models import UserProfile
|
||||
except:
|
||||
settings = None
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ from django.template import Context, loader
|
||||
from mitxmako.shortcuts import render_to_response, render_to_string
|
||||
|
||||
from models import StudentModule
|
||||
from user.models import UserProfile
|
||||
from student.models import UserProfile
|
||||
import track.views
|
||||
|
||||
import courseware.content_parser as content_parser
|
||||
|
||||
@@ -19,7 +19,7 @@ from lxml import etree
|
||||
|
||||
from module_render import render_module, modx_dispatch
|
||||
from models import StudentModule
|
||||
from user.models import UserProfile
|
||||
from student.models import UserProfile
|
||||
|
||||
import courseware.content_parser as content_parser
|
||||
import courseware.modules.capa_module
|
||||
|
||||
@@ -112,7 +112,7 @@ INSTALLED_APPS = (
|
||||
'django.contrib.messages',
|
||||
'django.contrib.staticfiles',
|
||||
'courseware',
|
||||
'user',
|
||||
'student',
|
||||
'django.contrib.humanize',
|
||||
'static_template_view',
|
||||
'staticbook',
|
||||
|
||||
@@ -18,7 +18,7 @@ class Migration(SchemaMigration):
|
||||
('meta', self.gf('django.db.models.fields.TextField')(blank=True)),
|
||||
('courseware', self.gf('django.db.models.fields.TextField')(default='course.xml', blank=True)),
|
||||
))
|
||||
db.send_create_signal('user', ['UserProfile'])
|
||||
db.send_create_signal('student', ['UserProfile'])
|
||||
|
||||
# Adding model 'Registration'
|
||||
db.create_table('auth_registration', (
|
||||
@@ -26,7 +26,7 @@ class Migration(SchemaMigration):
|
||||
('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], unique=True)),
|
||||
('activation_key', self.gf('django.db.models.fields.CharField')(unique=True, max_length=32, db_index=True)),
|
||||
))
|
||||
db.send_create_signal('user', ['Registration'])
|
||||
db.send_create_signal('student', ['Registration'])
|
||||
|
||||
|
||||
def backwards(self, orm):
|
||||
@@ -100,13 +100,13 @@ class Migration(SchemaMigration):
|
||||
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
|
||||
},
|
||||
'user.registration': {
|
||||
'student.registration': {
|
||||
'Meta': {'object_name': 'Registration', 'db_table': "'auth_registration'"},
|
||||
'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'})
|
||||
},
|
||||
'user.userprofile': {
|
||||
'student.userprofile': {
|
||||
'Meta': {'object_name': 'UserProfile', 'db_table': "'auth_userprofile'"},
|
||||
'courseware': ('django.db.models.fields.TextField', [], {'default': "'course.xml'", 'blank': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
@@ -118,4 +118,4 @@ class Migration(SchemaMigration):
|
||||
}
|
||||
}
|
||||
|
||||
complete_apps = ['user']
|
||||
complete_apps = ['student']
|
||||
@@ -122,13 +122,13 @@ class Migration(SchemaMigration):
|
||||
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
|
||||
},
|
||||
'user.registration': {
|
||||
'student.registration': {
|
||||
'Meta': {'object_name': 'Registration', 'db_table': "'auth_registration'"},
|
||||
'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'})
|
||||
},
|
||||
'user.userprofile': {
|
||||
'student.userprofile': {
|
||||
'Meta': {'object_name': 'UserProfile', 'db_table': "'auth_userprofile'"},
|
||||
'courseware': ('django.db.models.fields.CharField', [], {'default': "'course.xml'", 'max_length': '255', 'blank': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
@@ -140,4 +140,4 @@ class Migration(SchemaMigration):
|
||||
}
|
||||
}
|
||||
|
||||
complete_apps = ['user']
|
||||
complete_apps = ['student']
|
||||
16
urls.py
16
urls.py
@@ -10,13 +10,13 @@ import django.contrib.auth.views
|
||||
urlpatterns = ('',
|
||||
url(r'^event$', 'track.views.user_track'),
|
||||
url(r'^t/(?P<template>[^/]*)$', 'static_template_view.views.index'),
|
||||
url(r'^logout$', 'user.views.logout_user'),
|
||||
url(r'^logout$', 'student.views.logout_user'),
|
||||
url(r'^info$', 'util.views.info'),
|
||||
url(r'^login$', 'user.views.login_user'),
|
||||
url(r'^login/(?P<error>[^/]*)$', 'user.views.login_user'),
|
||||
url(r'^create_account$', 'user.views.create_account'),
|
||||
url(r'^activate/(?P<key>[^/]*)$', 'user.views.activate_account'),
|
||||
url(r'^$', 'user.views.index'),
|
||||
url(r'^login$', 'student.views.login_user'),
|
||||
url(r'^login/(?P<error>[^/]*)$', 'student.views.login_user'),
|
||||
url(r'^create_account$', 'student.views.create_account'),
|
||||
url(r'^activate/(?P<key>[^/]*)$', 'student.views.activate_account'),
|
||||
url(r'^$', 'student.views.index'),
|
||||
url(r'^password_reset/$', 'django.contrib.auth.views.password_reset',
|
||||
dict(from_email='registration@mitx.mit.edu'),name='auth_password_reset'),
|
||||
# url(r'^password_reset/$', 'auth.views.password_reset'),
|
||||
@@ -42,12 +42,12 @@ url(r'^wiki/', include('simplewiki.urls')),
|
||||
url(r'^courseware/(?P<course>[^/]*)/$', 'courseware.views.index'),
|
||||
url(r'^modx/(?P<module>[^/]*)/(?P<id>[^/]*)/(?P<dispatch>[^/]*)$', 'courseware.views.modx_dispatch'), #reset_problem'),
|
||||
url(r'^profile$', 'courseware.views.profile'),
|
||||
url(r'^change_setting$', 'user.views.change_setting'),
|
||||
url(r'^change_setting$', 'student.views.change_setting'),
|
||||
url(r'^s/(?P<template>[^/]*)$', 'static_template_view.views.auth_index'),
|
||||
url(r'^book/(?P<page>[^/]*)$', 'staticbook.views.index'),
|
||||
url(r'^book-shifted/(?P<page>[^/]*)$', 'staticbook.views.index_shifted'),
|
||||
url(r'^book*$', 'staticbook.views.index'),
|
||||
# url(r'^course_info/$', 'user.views.courseinfo'),
|
||||
# url(r'^course_info/$', 'student.views.courseinfo'),
|
||||
# url(r'^show_circuit/(?P<circuit>[^/]*)$', 'circuit.views.show_circuit'),
|
||||
url(r'^edit_circuit/(?P<circuit>[^/]*)$', 'circuit.views.edit_circuit'),
|
||||
url(r'^save_circuit/(?P<circuit>[^/]*)$', 'circuit.views.save_circuit'),
|
||||
|
||||
Reference in New Issue
Block a user