From 223fea53698a71e2762f476c395a28ecb5e2c18a Mon Sep 17 00:00:00 2001
From: NikDizell <nikdizell@gmail.com>
Date: Thu, 9 Apr 2026 18:44:02 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D1=81=D0=BB=D0=B0=D0=B3=20=D0=B8=20=D0=B4=D1=80=D1=83=D0=B3?=
 =?UTF-8?q?=D0=B8=D0=B5=D0=BA=20=D0=BC=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blog/templates/blog/article_detail.html       | 10 ++++-----
 programmer/admin.py                           |  4 +++-
 programmer/models.py                          | 18 +++++++++++++---
 programmer/templates/programmer/solution.html | 21 -------------------
 programmer/urls.py                            |  2 +-
 5 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/blog/templates/blog/article_detail.html b/blog/templates/blog/article_detail.html
index 37c8537..f66916b 100644
--- a/blog/templates/blog/article_detail.html
+++ b/blog/templates/blog/article_detail.html
@@ -60,15 +60,12 @@
     {% endif %}
 </div>
 
-<!-- Скрипт для модального окна -->
-<script src="{% static 'programmer/js/recall.js' %}"></script>
-
 <!-- Модальное окно для увеличения изображений -->
 <div id="imageModal" class="modal">
     <div class="modal-content">
         <div class="modal-header">
             <h3 id="modalTitle">Просмотр изображения</h3>
-            <button class="modal-close" onclick="closeModal()">&times;</button>
+            <button class="modal-close" onclick="ImageModal.close()">&times;</button>
         </div>
         <div class="modal-body">
             <img class="modal-image" id="modalImage" alt="">
@@ -76,6 +73,9 @@
     </div>
 </div>
 
+<!-- Скрипт для модального окна -->
+<script src="{% static 'programmer/js/recall.js' %}"></script>
+
 {% endblock %}
 
 {% block extra_js %}
@@ -90,7 +90,7 @@
             img.style.cursor = 'pointer';
             img.addEventListener('click', function() {
                 // Вызываем глобальную функцию openModal из recall.js
-                openModal(this.src, this.alt || 'Изображение из статьи');
+                ImageModal.open(this.src, this.alt || 'Изображение из статьи');
             });
         });
     });
diff --git a/programmer/admin.py b/programmer/admin.py
index 53c0cb1..004a1c6 100644
--- a/programmer/admin.py
+++ b/programmer/admin.py
@@ -68,10 +68,12 @@ class SolutionAdmin(BaseContentAdmin):
     list_display = ('id', 'title', 'time_create', 'is_published')
     list_display_links = ('id', 'title')
     search_fields = ('title', 'description', 'implementation')
+    prepopulated_fields = {'slug': ('title',)}
+
 
     fieldsets = (
         (None, {
-            'fields': ('title', 'is_published'),
+            'fields': ('title', 'slug', 'is_published'),
         }),
         ('Содержание', {
             'fields': ('description', 'implementation', 'closing'),
diff --git a/programmer/models.py b/programmer/models.py
index 14685de..303c1bf 100644
--- a/programmer/models.py
+++ b/programmer/models.py
@@ -69,12 +69,24 @@ class Solution(models.Model):
     time_create = models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')
     time_update = models.DateTimeField(auto_now=True, verbose_name='Дата изменения')
     is_published = models.BooleanField(default=True, verbose_name='Опубликован')
-
+    slug = models.SlugField(
+        max_length=255,
+        unique=False,          # временно не уникальное
+        db_index=True,
+        verbose_name='URL-идентификатор',
+        blank=True,
+        null=True,             # разрешаем NULL
+    )
     def __str__(self):
         return self.title
-
+    
+    def save(self, *args, **kwargs):
+        if not self.slug:
+            self.slug = slugify(self.title)
+        super().save(*args, **kwargs)
+        
     def get_absolute_url(self):
-        return reverse('solution_detail', kwargs={'pk': self.pk})
+        return reverse('solution_detail', kwargs={'slug': self.slug})
 
     class Meta:
         verbose_name = 'Проекты'
diff --git a/programmer/templates/programmer/solution.html b/programmer/templates/programmer/solution.html
index 06157f8..f5d67c6 100644
--- a/programmer/templates/programmer/solution.html
+++ b/programmer/templates/programmer/solution.html
@@ -15,27 +15,6 @@
 
 <div class="projects-grid" id="projects-container">
     {% include 'programmer/includes/project_cards.html' %}
-    <!-- {% for solution in posts %}
-    <article class="modern-card">
-        <h2 class="card-title">
-            <a href="{{ solution.get_absolute_url }}">{{ solution.title }}</a>
-        </h2>
-        <p class="card-subtitle">
-            {{ solution.description|striptags|truncatewords:30 }}
-        </p>
-        <div class="meta" style="display: flex; justify-content: space-between; margin-top: 1rem;">
-            <span>📅 {{ solution.time_create|date:"d.m.Y" }}</span>
-            <a href="{{ solution.get_absolute_url }}" class="btn btn-outline" style="padding: 0.5rem 1rem;">
-                Подробнее →
-            </a>
-        </div>
-    </article>
-    {% empty %}
-    <div class="content-card text-center" style="grid-column: 1/-1;">
-        <h3>Примеры решений скоро появятся</h3>
-        <p>Мы готовим для вас интересные кейсы и решения</p>
-    </div>
-    {% endfor %} --> 
 </div>
 
 {% if not posts %}
diff --git a/programmer/urls.py b/programmer/urls.py
index f5d2461..d89190d 100644
--- a/programmer/urls.py
+++ b/programmer/urls.py
@@ -14,7 +14,7 @@ urlpatterns = [
     path('', views.HomePageView.as_view(), name='home'),
     path('about/', views.AboutPageView.as_view(), name='about'),
     path('solutions/', views.SolutionListView.as_view(), name='solution'),
-    path('solutions/<int:pk>/', SolutionDetailView.as_view(), name='solution_detail'),
+    path('solutions/<slug:slug>/', SolutionDetailView.as_view(), name='solution_detail'),    
     # path('competence/', ability, name='ability'),
     # path('competence/<int:pk>/', CompetenceDetailView.as_view(), name='competence_detail'),
     path('recall/', views.RecallListView.as_view(), name='recall'),