Skip to content

Commit

Permalink
rename course -> core for the main app
Browse files Browse the repository at this point in the history
  • Loading branch information
santagada committed Aug 24, 2013
1 parent 400bef1 commit adb9813
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 22 deletions.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"pk": 1,
"model": "course.timtecuser",
"model": "core.timtecuser",
"fields": {
"username": "a",
"first_name": "",
Expand All @@ -19,7 +19,7 @@
},
{
"pk": 2,
"model": "course.timtecuser",
"model": "core.timtecuser",
"fields": {
"username": "ramalho",
"first_name": "Luciano",
Expand All @@ -37,15 +37,15 @@
},
{
"pk": 1,
"model": "course.video",
"model": "core.video",
"fields": {
"name": "IntroDB",
"youtube_id": "qb-6oDS9pB4"
}
},
{
"pk": 1,
"model": "course.course",
"model": "core.course",
"fields": {
"status": "public",
"requirement": "O interessado dever\u00e1 possuir conhecimentos b\u00e1sicos (selecionar, copiar, colar, criar pastas, salvar e renomear documentos) de algum sistema operacional e de navega\u00e7\u00e3o na Internet. \r\nPara participar deste curso e realizar seus exerc\u00edcios \u00e9 necess\u00e1rio um computador com acesso \u00e0 internet, navegador web atualizado (pelo menos 2) e algum programa de edi\u00e7\u00e3o de texto sem formata\u00e7\u00e3o. \r\n\u00c9 recomendada a idade m\u00ednima de 14 anos.",
Expand All @@ -62,7 +62,7 @@
},
{
"pk": 1,
"model": "course.courseprofessor",
"model": "core.courseprofessor",
"fields": {
"course": 1,
"user": 2,
Expand All @@ -71,7 +71,7 @@
},
{
"pk": 1,
"model": "course.lesson",
"model": "core.lesson",
"fields": {
"position": 0,
"desc": "Pellentesque augue sit dapibus sociis magna amet cras mattis egestas, elementum placerat sagittis.",
Expand All @@ -82,7 +82,7 @@
},
{
"pk": 2,
"model": "course.lesson",
"model": "core.lesson",
"fields": {
"position": 1,
"desc": "Pellentesque augue sit dapibus sociis magna amet cras mattis egestas, elementum placerat sagittis!",
Expand All @@ -93,7 +93,7 @@
},
{
"pk": 3,
"model": "course.lesson",
"model": "core.lesson",
"fields": {
"position": 2,
"desc": "Pellentesque augue sit dapibus sociis magna amet cras mattis egestas, elementum placerat sagittis!",
Expand All @@ -104,7 +104,7 @@
},
{
"pk": 4,
"model": "course.lesson",
"model": "core.lesson",
"fields": {
"position": 3,
"desc": "Pellentesque augue sit dapibus sociis magna amet cras mattis egestas, elementum placerat sagittis!",
Expand All @@ -115,7 +115,7 @@
},
{
"pk": 5,
"model": "course.lesson",
"model": "core.lesson",
"fields": {
"position": 4,
"desc": "Pellentesque augue sit dapibus sociis magna amet cras mattis egestas, elementum placerat sagittis!",
Expand All @@ -126,7 +126,7 @@
},
{
"pk": 6,
"model": "course.lesson",
"model": "core.lesson",
"fields": {
"position": 5,
"desc": "Pellentesque augue sit dapibus sociis magna amet cras mattis egestas, elementum placerat sagittis!",
Expand All @@ -137,7 +137,7 @@
},
{
"pk": 7,
"model": "course.lesson",
"model": "core.lesson",
"fields": {
"position": 6,
"desc": "Pellentesque augue sit dapibus sociis magna amet cras mattis egestas, elementum placerat sagittis!",
Expand All @@ -148,7 +148,7 @@
},
{
"pk": 8,
"model": "course.lesson",
"model": "core.lesson",
"fields": {
"position": 7,
"desc": "Pellentesque augue sit dapibus sociis magna amet cras mattis egestas, elementum placerat sagittis!",
Expand All @@ -159,7 +159,7 @@
},
{
"pk": 9,
"model": "course.lesson",
"model": "core.lesson",
"fields": {
"position": 8,
"desc": "Pellentesque augue sit dapibus sociis magna amet cras mattis egestas, elementum placerat sagittis!",
Expand All @@ -170,7 +170,7 @@
},
{
"pk": 10,
"model": "course.lesson",
"model": "core.lesson",
"fields": {
"position": 9,
"desc": "Pellentesque augue sit dapibus sociis magna amet cras mattis egestas, elementum placerat sagittis!",
Expand All @@ -181,7 +181,7 @@
},
{
"pk": 11,
"model": "course.lesson",
"model": "core.lesson",
"fields": {
"position": 10,
"desc": "Pellentesque augue sit dapibus sociis magna amet cras mattis egestas, elementum placerat sagittis!",
Expand All @@ -192,7 +192,7 @@
},
{
"pk": 12,
"model": "course.lesson",
"model": "core.lesson",
"fields": {
"position": 11,
"desc": "Pellentesque augue sit dapibus sociis magna amet cras mattis egestas, elementum placerat sagittis!",
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/test_models.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import pytest
from course.models import *
from core.models import *


@pytest.mark.django_db
Expand Down
8 changes: 4 additions & 4 deletions timtec/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
# 'CONFIRM_UNSAVED_CHANGES': True, # Default True

# menu
'SEARCH_URL': '/admin/course/timtecuser/',
'SEARCH_URL': '/admin/core/timtecuser/',
# 'MENU_ICONS': {
# 'sites': 'icon-leaf',
# 'auth': 'icon-lock',
Expand All @@ -120,15 +120,15 @@
# 'MENU': (
# 'sites',
# {'app': 'auth', 'icon':'icon-lock', 'models': ('user', 'group')},
# {'label': 'Settings', 'icon':'icon-cog', 'models': ('course.TimtecUser', 'auth.group')},
# {'label': 'Settings', 'icon':'icon-cog', 'models': ('core.TimtecUser', 'auth.group')},
# # {'label': 'Support', 'icon':'icon-question-sign', 'url': '/support/'},
# ),

# misc
# 'LIST_PER_PAGE': 15
}

AUTH_USER_MODEL = 'course.TimtecUser'
AUTH_USER_MODEL = 'core.TimtecUser'

MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
Expand Down Expand Up @@ -162,7 +162,7 @@
'django.contrib.admin',
# Uncomment the next line to enable admin documentation:
'django.contrib.admindocs',
'course',
'core',
)

# A sample logging configuration. The only tangible logging
Expand Down

0 comments on commit adb9813

Please sign in to comment.