From 69cf9d3279499cefd0ee578b06c5bd82ad4f6558 Mon Sep 17 00:00:00 2001 From: alazo Date: Fri, 16 Feb 2018 15:11:06 +0100 Subject: [PATCH] Rename_Document_to_Concept --- cms/admin.py | 22 +++--- cms/forms.py | 10 +-- .../0007_Rename_Document_to_Concept.py | 67 +++++++++++++++++++ cms/models.py | 2 +- cms/views.py | 10 +-- common/urls.py | 2 +- templates/cms/base_site.html | 7 +- ...cument_detail.html => concept_detail.html} | 0 .../{document_list.html => concept_list.html} | 0 9 files changed, 96 insertions(+), 24 deletions(-) create mode 100644 cms/migrations/0007_Rename_Document_to_Concept.py rename templates/cms/{document_detail.html => concept_detail.html} (100%) rename templates/cms/{document_list.html => concept_list.html} (100%) diff --git a/cms/admin.py b/cms/admin.py index ac4648e..f675b9b 100644 --- a/cms/admin.py +++ b/cms/admin.py @@ -1,12 +1,16 @@ from django.contrib import admin -from .models import (Enseignant, Domaine, Competence, SousCompetence, Objectif, - Ressource, Module, Processus, Document, UploadDoc) +from .models import ( + Enseignant, Domaine, Competence, SousCompetence, Objectif, + Ressource, Module, Processus, Concept, UploadDoc +) -from .forms import (ProcessusAdminForm, ProcessusInlineAdminForm, ModuleAdminForm, - DomaineAdminForm, CompetenceAdminForm, SousCompetenceInlineAdminForm, - CompetenceInlineAdminForm, ObjectifAdminForm, RessourceAdminForm, - SousCompetenceAdminForm, DocumentAdminForm, UploadAdminForm) +from .forms import ( + ProcessusAdminForm, ProcessusInlineAdminForm, ModuleAdminForm, + DomaineAdminForm, CompetenceAdminForm, SousCompetenceInlineAdminForm, + CompetenceInlineAdminForm, ObjectifAdminForm, RessourceAdminForm, + SousCompetenceAdminForm, ConceptAdminForm, UploadAdminForm +) class SousCompetenceInline(admin.TabularInline): @@ -74,8 +78,8 @@ class DomaineAdmin(admin.ModelAdmin): inlines = [ProcessusInlineAdmin] -class DocumentAdmin(admin.ModelAdmin): - form = DocumentAdminForm +class ConceptAdmin(admin.ModelAdmin): + form = ConceptAdminForm class UploadAdmin(admin.ModelAdmin): @@ -90,5 +94,5 @@ admin.site.register(Objectif, ObjectifAdmin) admin.site.register(Ressource, RessourceAdmin) admin.site.register(Module, ModuleAdmin) admin.site.register(Processus, ProcessusAdmin) -admin.site.register(Document, DocumentAdmin) +admin.site.register(Concept, ConceptAdmin) admin.site.register(UploadDoc, UploadAdmin) diff --git a/cms/forms.py b/cms/forms.py index 20c908a..5fd0b75 100644 --- a/cms/forms.py +++ b/cms/forms.py @@ -4,15 +4,17 @@ Created on 17 nov. 2012 @author: alzo """ from django import forms - -from .models import (Processus, Module, Domaine, Competence, SousCompetence, Document, UploadDoc) from tinymce.widgets import TinyMCE +from .models import ( + Processus, Module, Domaine, Competence, SousCompetence, Concept, UploadDoc +) -class DocumentAdminForm(forms.ModelForm): + +class ConceptAdminForm(forms.ModelForm): class Meta: - model = Document + model = Concept fields = ('titre', 'texte', 'published') widgets = { diff --git a/cms/migrations/0007_Rename_Document_to_Concept.py b/cms/migrations/0007_Rename_Document_to_Concept.py new file mode 100644 index 0000000..7f7152b --- /dev/null +++ b/cms/migrations/0007_Rename_Document_to_Concept.py @@ -0,0 +1,67 @@ +# Generated by Django 2.0.1 on 2018-02-16 14:01 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('cms', '0006_auto_20170616_0906'), + ] + + operations = [ + migrations.RenameModel( + old_name='Document', + new_name='Concept', + ), + migrations.RemoveField( + model_name='module', + name='periode_presentiel', + ), + migrations.AlterField( + model_name='competence', + name='module', + field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='cms.Module'), + ), + migrations.AlterField( + model_name='competence', + name='proces_eval', + field=models.ForeignKey(default=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='cms.Processus'), + ), + migrations.AlterField( + model_name='domaine', + name='responsable', + field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='cms.Enseignant'), + ), + migrations.AlterField( + model_name='module', + name='processus', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='cms.Processus'), + ), + migrations.AlterField( + model_name='objectif', + name='module', + field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.PROTECT, to='cms.Module'), + ), + migrations.AlterField( + model_name='processus', + name='domaine', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='cms.Domaine'), + ), + migrations.AlterField( + model_name='ressource', + name='module', + field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.PROTECT, to='cms.Module'), + ), + migrations.AlterField( + model_name='souscompetence', + name='competence', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='cms.Competence'), + ), + migrations.AlterField( + model_name='uploaddoc', + name='docfile', + field=models.FileField(upload_to='doc'), + ), + ] diff --git a/cms/models.py b/cms/models.py index 5322b46..c629ee4 100644 --- a/cms/models.py +++ b/cms/models.py @@ -177,7 +177,7 @@ class Objectif(models.Model): return '{0}'.format(self.nom) -class Document(models.Model): +class Concept(models.Model): titre = models.CharField(max_length=128, blank=True) texte = tinymce_models.HTMLField(blank=True,) published = models.BooleanField(default=False) diff --git a/cms/views.py b/cms/views.py index 44def8e..836bcbe 100644 --- a/cms/views.py +++ b/cms/views.py @@ -11,7 +11,9 @@ from django.db.models import F, Sum from django.http import HttpResponse from cms.pdf import PeriodSemesterPdf, ModuleDescriptionPdf, FormationPlanPdf -from cms.models import (Domaine, Processus, Module, Competence, Document, UploadDoc,) +from cms.models import ( + Domaine, Processus, Module, Competence, Concept, UploadDoc +) class HomeView(TemplateView): @@ -63,9 +65,9 @@ class EvaluationView(ListView): model = Processus -class DocumentDetailView(DetailView): - template_name = 'cms/document_detail.html' - model = Document +class ConceptDetailView(DetailView): + template_name = 'cms/concept_detail.html' + model = Concept class UploadDocListView(ListView): diff --git a/common/urls.py b/common/urls.py index 36522b1..7f668dc 100644 --- a/common/urls.py +++ b/common/urls.py @@ -39,7 +39,7 @@ urlpatterns = [ path('travail/', views.TravailPersoListView.as_view(), name='travail'), path('module_pdf//', views.print_module_pdf, name='module-pdf'), path('upload/', views.UploadDocListView.as_view(), name='uploaddoc-list'), - path('document//', views.DocumentDetailView.as_view(), name='document-detail'), + path('document//', views.ConceptDetailView.as_view(), name='concept-detail'), path('upload//', views.UploadDocDetailView.as_view(), name='uploaddoc-detail'), # url(r'^emplois/$', views.EmploiListView.as_view(), name='emploi-list'), diff --git a/templates/cms/base_site.html b/templates/cms/base_site.html index 5680ce8..8cbd1f5 100644 --- a/templates/cms/base_site.html +++ b/templates/cms/base_site.html @@ -26,11 +26,8 @@
  • Périodes  
  • Compétences  
  • Heures de formation  
    • -
  • Concept pédagogique  
    • -
  • Concept de formation  
    • - - - +
  • Concept pédagogique  
    • +
  • Concept de formation  
  • Téléchargements  
    • {% if has_permission %}
  • Calendrier  
    • diff --git a/templates/cms/document_detail.html b/templates/cms/concept_detail.html similarity index 100% rename from templates/cms/document_detail.html rename to templates/cms/concept_detail.html diff --git a/templates/cms/document_list.html b/templates/cms/concept_list.html similarity index 100% rename from templates/cms/document_list.html rename to templates/cms/concept_list.html