VBV-142: move "/media" to "/static/media"

This commit is contained in:
Daniel Egger 2022-09-09 11:00:31 +02:00
parent 9c24ede7ab
commit 3ff2b23cf7
352 changed files with 17 additions and 21 deletions

4
.gitignore vendored
View File

@ -283,6 +283,4 @@ cypress/test-reports
/server/vbv_lernwelt/static/css/tailwind.css
/server/vbv_lernwelt/static/vue/
/server/vbv_lernwelt/templates/vue/index.html
!/server/vbv_lernwelt/media/
SchweizerischesZivilgesetzbuch_*
SmallPDF_*
/server/vbv_lernwelt/media

View File

@ -1,2 +1,2 @@
nodejs 16.17.0
python 3.10.5
python 3.10.6

View File

@ -213,7 +213,7 @@
"type": "exercise",
"value": {
"description": "Beispiel Aufgabe",
"url": "/media/web_based_trainings/story-01-a-01-patrizia-marco-sichern-sich-ab-einstieg/scormcontent/index.html"
"url": "/static/media/web_based_trainings/story-01-a-01-patrizia-marco-sichern-sich-ab-einstieg/scormcontent/index.html"
},
"id": "b7e661b1-9e39-4482-8b23-c24dad1ef648"
}
@ -264,7 +264,7 @@
"type": "exercise",
"value": {
"description": "Beispiel Aufgabe",
"url": "/media/web_based_trainings/story-06-a-01-emma-und-ayla-campen-durch-amerika-einstieg/scormcontent/index.html"
"url": "/static/media/web_based_trainings/story-06-a-01-emma-und-ayla-campen-durch-amerika-einstieg/scormcontent/index.html"
},
"id": "87333833-ad07-4c86-a846-46232668e8e1"
}
@ -353,4 +353,4 @@
]
}
]
}
}

View File

@ -9,8 +9,7 @@ from vbv_lernwelt.learnpath.models import LearningPath, Topic, Circle, LearningS
LearningUnitQuestion
from vbv_lernwelt.learnpath.tests.learning_path_factories import LearningPathFactory, TopicFactory, CircleFactory, \
LearningSequenceFactory, LearningContentFactory, VideoBlockFactory, PodcastBlockFactory, CompetenceBlockFactory, \
ExerciseBlockFactory, DocumentBlockFactory, LearningUnitFactory, LearningUnitQuestionFactory, \
WebBasedTrainingBlockFactory
ExerciseBlockFactory, DocumentBlockFactory, LearningUnitFactory, LearningUnitQuestionFactory
def create_circle(title, learning_path):
@ -114,7 +113,7 @@ def create_circle_children(circle, title):
title='Was braucht eine Familie?',
parent=circle,
minutes=60,
contents=[('exercise', ExerciseBlockFactory(url='/media/web_based_trainings/story-01-a-01-patrizia-marco-sichern-sich-ab-einstieg/scormcontent/index.html'
contents=[('exercise', ExerciseBlockFactory(url='/static/media/web_based_trainings/story-01-a-01-patrizia-marco-sichern-sich-ab-einstieg/scormcontent/index.html'
))]
)
@ -183,7 +182,7 @@ def create_circle_children(circle, title):
title='Motorfahrzeug kaufen',
parent=circle,
minutes=120,
contents=[('exercise', ExerciseBlockFactory(url='/media/web_based_trainings/training-04-a-01-rafael-fasel-wechselt-sein-auto-einstieg/scormcontent/index.html'))]
contents=[('exercise', ExerciseBlockFactory(url='/static/media/web_based_trainings/training-04-a-01-rafael-fasel-wechselt-sein-auto-einstieg/scormcontent/index.html'))]
)
lu = LearningUnitFactory(title='Pensionierung', parent=circle)
@ -232,7 +231,7 @@ def create_circle_children(circle, title):
parent=circle,
minutes=120,
contents=[('exercise', ExerciseBlockFactory(
url='/media/web_based_trainings/story-06-a-01-emma-und-ayla-campen-durch-amerika-einstieg/scormcontent/index.html'))]
url='/static/media/web_based_trainings/story-06-a-01-emma-und-ayla-campen-durch-amerika-einstieg/scormcontent/index.html'))]
)
lu = LearningUnitFactory(title='Haushalt', parent=circle)

View File

@ -72,7 +72,7 @@ def create_circle_children(circle, title):
title='Was braucht eine Familie?',
parent=circle,
minutes=60,
contents=[('exercise', ExerciseBlockFactory(url='/media/web_based_trainings/story-01-a-01-patrizia-marco-sichern-sich-ab-einstieg/scormcontent/index.html'
contents=[('exercise', ExerciseBlockFactory(url='/static/media/web_based_trainings/story-01-a-01-patrizia-marco-sichern-sich-ab-einstieg/scormcontent/index.html'
))]
)
@ -93,7 +93,7 @@ def create_circle_children(circle, title):
parent=circle,
minutes=120,
contents=[('exercise', ExerciseBlockFactory(
url='/media/web_based_trainings/story-06-a-01-emma-und-ayla-campen-durch-amerika-einstieg/scormcontent/index.html'))]
url='/static/media/web_based_trainings/story-06-a-01-emma-und-ayla-campen-durch-amerika-einstieg/scormcontent/index.html'))]
)
LearningSequenceFactory(title='Beenden', parent=circle, icon='it-icon-ls-end')

View File

@ -65,7 +65,7 @@ class VideoBlockFactory(wagtail_factories.StructBlockFactory):
class WebBasedTrainingBlockFactory(wagtail_factories.StructBlockFactory):
url = "/media/web_based_trainings/rise_cmi5_test_export/scormcontent/index.html"
url = "/static/media/web_based_trainings/rise_cmi5_test_export/scormcontent/index.html"
description = "Beispiel Rise Modul"
class Meta:
@ -89,7 +89,7 @@ class CompetenceBlockFactory(wagtail_factories.StructBlockFactory):
class ExerciseBlockFactory(wagtail_factories.StructBlockFactory):
description = "Beispiel Aufgabe"
url= "/media/web_based_trainings/rise_cmi5_test_export/scormcontent/index.html"
url = "/static/media/web_based_trainings/rise_cmi5_test_export/scormcontent/index.html"
class Meta:
model = ExerciseBlock

View File

@ -1,11 +1,10 @@
from wagtail.core.models import Collection
import factory
from django.core.files import File
import os
import factory
from wagtail.core.models import Collection
from vbv_lernwelt.media_library.models import LibraryDocument
from vbv_lernwelt.media_library.tests.media_library_factories import LibraryDocumentFactory
from factory.django import DjangoModelFactory
def create_default_collections():
@ -26,7 +25,7 @@ def create_default_collections():
def create_default_documents():
LibraryDocument.objects.all().delete()
path = os.path.join(os.path.dirname(os.path.abspath(__file__)), '../media/documents/')
path = os.path.join(os.path.dirname(os.path.abspath(__file__)), '../static/media/documents/')
collection = Collection.objects.get(name='Fahrzeug')

Some files were not shown because too many files have changed in this diff Show More