From 7e45b33252221ca3ba534d58e3e452d17779b0a9 Mon Sep 17 00:00:00 2001
From: Hironsan <hiroki.nakayama.py@gmail.com>
Date: Wed, 8 Aug 2018 17:03:50 +0900
Subject: [PATCH] Simplify projects view

---
 app/db.sqlite3       | Bin 262144 -> 262144 bytes
 app/server/models.py |   4 ++++
 app/server/views.py  |  23 ++++-------------------
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/app/db.sqlite3 b/app/db.sqlite3
index d2eb71cfc0d7917d9726e3ee0478a027e0a5998c..9416a62c5870298f3439d49680609084357c5bb2 100644
GIT binary patch
delta 1721
zcmai!O>7fK6vy}3gs`#4vx&1wTk<8Pk-$~fGqbZhUbmEnaDf8}2Lx3(B#ru!q#+CW
zQlzSz3aTnSQ6XUo6^T=Cg`x;H7myMO5P}0J=L*EJCpaMlYCE$IvDS$djs4!?z4v?n
znb|jsi^k%jad9u~|E;Yb_TL;1ENH#--1;0^E_LSfFn@j^9}eW<mY<wQqEvqk9vWx_
z4WScg03AX7=l~MolWTA?P3n>W4fBzmi|lM<XCgZt*>jOS8(Ba6_D{H)kl5>``oG|r
zfu5qr=mA<ochCx2M%R~V*Gjtd@;}&B`s3fkaM*Mg_8c<sukp3qI6R7-0<^Yhnnt0;
zlr9Hmvvl3ioRzK(vQ5&N(9|eh1{w|N>cPOJHJmtQ;NRm*0%vhAiFmmP_i;q)h+rQ?
ztfmN+j!3%=96s($95W2O6kn3`m6E2n%7zqlr7#D&QrHc;QrHH%QfPv%6lOqI3hO~P
z!qtO`p)RAYC%%^Zj5oUiw3>LC?dwBcc41+G5nAXa>eod?(V<0~SOrF@ZP$tja(HTV
zcJk{pGyUI>Oizz}Gd4OhGd6Wb!X)`}nLIu|UR6(ulv%_jG+<==kZ`!OJzCNv`m-{6
zVqzj*&+Ve)S~e$+;58yHuZRv}swEAr!i#ow9_{|r*tq&vQCN|?mT-mbiW(8l#P-VH
z6J?JdH+lp$n{bPA&*jydknN+0Aoh+;KH6y`#0nVaHr-|?#8MHD?$kuPUA_q4_p6SB
z7MWuSE|^pG_3+JzM}r!C-$$$3X;WQ<x%CokyGU%y^@!tCozG^(WtB^g-Lazml)`&7
zPr`e{&hHX$g@Iqhmz=f>xM!alvTikE9csWnRO8jGh6}6FYEYwJhkseWkqFmsB<UBH
znVQt_6Z``n#GRQ(nTwghOb2>}?x7__(toFKrhiU<nckOrow}d8lA4rH(x<85lX+ch
zGy#F$M_r{Y*$_WRhZTvuaUlx4keidq*>bXwCtfSpVJ^+j%G~yHZsGlxx1}K1pfi_?
z{7j|7t65Pla6KlR{Pbo4BRdti9`|zRHuW<qhb`G4=Rfx3Y|!PG=jP5<l9?R(E!sD7
ksqpNaU&*!Q+fyUgDR9p_KBa5egdut2{Al>kyJSo9e<T!=*8l(j

delta 232
zcmZo@5NK!+m>|u_KT*b+k$+=Cy&fa~<Oh0ojC_;j_4OI^oBj2-`|C4qEnv>)O`p!b
zfbrz^2MZX(c_s%4IBZW}%Q%+_C~<8%`v%7Qn++8{@J#>kpOIzyxqnO++lBTqayV@k
zOjyA`{SZG>1dz3ffBPAECO-inb2<O^gZ50(3Y#4T?y$=?3i5C;$U8cQS{eqY=9OgT
z0tq7nLknF4AlfdP!Nh6-)U%TxY<m0k^-SBZuV>bEkmKdK%fNquzlJ}6U!LzY-vqt@
bJ~`fxyhnLEc@22(0v)uQXZzhh%*xCF<X2AW

diff --git a/app/server/models.py b/app/server/models.py
index f1e05054..f2c1af38 100644
--- a/app/server/models.py
+++ b/app/server/models.py
@@ -1,6 +1,7 @@
 import string
 from django.core.exceptions import ValidationError
 from django.db import models
+from django.urls import reverse
 from django.contrib.auth.models import User
 from django.contrib.staticfiles.storage import staticfiles_storage
 
@@ -24,6 +25,9 @@ class Project(models.Model):
     users = models.ManyToManyField(User)
     project_type = models.CharField(max_length=30, choices=PROJECT_CHOICES)
 
+    def get_absolute_url(self):
+        return reverse('upload', args=[self.id])
+
     def is_type_of(self, project_type):
         return project_type == self.project_type
 
diff --git a/app/server/views.py b/app/server/views.py
index 61dc9c3d..315b2af6 100644
--- a/app/server/views.py
+++ b/app/server/views.py
@@ -3,9 +3,9 @@ from io import TextIOWrapper
 
 from django.urls import reverse
 from django.http import HttpResponse, HttpResponseRedirect
-from django.shortcuts import render, get_object_or_404
+from django.shortcuts import get_object_or_404
 from django.views import View
-from django.views.generic import TemplateView
+from django.views.generic import TemplateView, CreateView
 from django.views.generic.list import ListView
 from django.contrib.auth.mixins import LoginRequiredMixin
 
@@ -25,23 +25,10 @@ class ProjectView(LoginRequiredMixin, TemplateView):
         return [project.get_template_name()]
 
 
-class ProjectsView(LoginRequiredMixin, TemplateView):
-    model = Project
-    paginate_by = 100
+class ProjectsView(LoginRequiredMixin, CreateView):
+    form_class = ProjectForm
     template_name = 'projects.html'
 
-    def get(self, request, *args, **kwargs):
-        form = ProjectForm()
-        return render(request, self.template_name, {'form': form})
-
-    def post(self, request, *args, **kwargs):
-        form = ProjectForm(request.POST)
-        if form.is_valid():
-            project = form.save()
-            return HttpResponseRedirect(reverse('upload', args=[project.id]))
-        else:
-            return render(request, self.template_name, {'form': form})
-
 
 class DatasetView(SuperUserMixin, LoginRequiredMixin, ListView):
     template_name = 'admin/dataset.html'
@@ -61,7 +48,6 @@ class StatsView(SuperUserMixin, LoginRequiredMixin, TemplateView):
 
 
 class DataUpload(SuperUserMixin, LoginRequiredMixin, TemplateView):
-    model = Project
     template_name = 'admin/dataset_upload.html'
 
     def post(self, request, *args, **kwargs):
@@ -74,7 +60,6 @@ class DataUpload(SuperUserMixin, LoginRequiredMixin, TemplateView):
                 Document(text=text, project=project).save()
             return HttpResponseRedirect(reverse('dataset', args=[project.id]))
         except:
-            print("failed")
             return HttpResponseRedirect(reverse('dataset-upload', args=[project.id]))