Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
roomlist
Commits
ef24b989
Commit
ef24b989
authored
May 22, 2017
by
Daniel W Bond
Browse files
modified broken imports derived from moved utilities
parent
1f383d74
Changes
4
Hide whitespace changes
Inline
Side-by-side
roomlist/accounts/views.py
View file @
ef24b989
...
...
@@ -26,7 +26,7 @@ from .models import Student, Major, Confirmation
from
.forms
import
StudentUpdateForm
,
FarewellFeedbackForm
from
.student_messages
import
return_messages
from
housing.models
import
Room
from
housing.view
s
import
shadowbanning
from
core.util
s
import
shadowbanning
,
on_the_same_floor
,
pk_or_none
# details about the student
...
...
roomlist/settings/urls.py
View file @
ef24b989
...
...
@@ -35,7 +35,7 @@ urlpatterns = patterns('',
login_url
=
'login'
),
name
=
'search'
),
# login and logout
url
(
r
'^login/'
,
'
accounts.view
s.custom_cas_login'
,
name
=
'login'
),
url
(
r
'^login/'
,
'
core.util
s.custom_cas_login'
,
name
=
'login'
),
url
(
r
'^logout/'
,
'cas.views.logout'
,
name
=
'logout'
),
# url(r'^login/$', 'django.contrib.auth.views.login', name='login'),
...
...
roomlist/settings/views.py
View file @
ef24b989
...
...
@@ -10,7 +10,7 @@ from django.core.urlresolvers import reverse
from
braces.views
import
LoginRequiredMixin
from
accounts.models
import
Student
,
Major
# imports from your apps
from
housing.view
s
import
shadowbanning
from
core.util
s
import
shadowbanning
class
HomePageView
(
View
):
...
...
roomlist/welcome/views.py
View file @
ef24b989
...
...
@@ -12,7 +12,7 @@ from braces.views import LoginRequiredMixin
from
ratelimit.decorators
import
ratelimit
# imports from your apps
from
accounts.models
import
Student
,
Confirmation
,
Major
from
accounts.view
s
import
create_email
,
no_nums
from
core.util
s
import
create_email
,
no_nums
,
get_semester
from
housing.models
import
Room
from
.forms
import
(
WelcomeNameForm
,
WelcomeMajorForm
,
WelcomePrivacyForm
,
WelcomeSocialForm
)
...
...
Write
Preview
Markdown
is supported
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