corrige les conflits entre les articles homonymes

zestedesavoir · Jun 17, 2014 · f622d94 · f622d94
1 parent a91b371
commit f622d94
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/zds/article/models.py b/zds/article/models.py
@@ -95,6 +95,9 @@ def get_absolute_url(self):
         return reverse('zds.article.views.view',
                        kwargs={'article_pk': self.pk,
                                'article_slug': slugify(self.title)})
+
+    def get_slug(self):
+        return str(self.pk) + "_" + self.slug
 
     def get_absolute_url_online(self):
         return reverse('zds.article.views.view_online',
@@ -118,7 +121,7 @@ def get_path(self, relative=False):
         if relative:
             return None
         else:
-            return os.path.join(settings.REPO_ARTICLE_PATH, self.slug)
+            return os.path.join(settings.REPO_ARTICLE_PATH, self.get_slug())
 
     def load_json(self, path=None, online=False):
         if path is None:

diff --git a/zds/article/views.py b/zds/article/views.py
@@ -322,8 +322,7 @@ def edit(request):
 
             new_slug = os.path.join(
                 settings.REPO_ARTICLE_PATH,
-                slugify(
-                    data['title']))
+                article.get_slug())
 
             maj_repo_article(request,
                              old_slug_path=old_slug,
@@ -334,7 +333,7 @@ def edit(request):
 
             return redirect(article.get_absolute_url())
     else:
-        form = ArticleForm({
+        form = ArticleForm(initial={
             'title': json['title'],
             'description': json['description'],
             'text': article.get_text(),
@@ -410,7 +409,7 @@ def download(request):
 
     article = get_object_or_404(Article, pk=request.GET['article'])
 
-    ph = os.path.join(settings.REPO_ARTICLE_PATH, article.slug)
+    ph = os.path.join(settings.REPO_ARTICLE_PATH, article.get_slug())
     repo = Repo(ph)
     repo.archive(open(ph + ".tar", 'w'))