From b661cf74f19fb048344cd604aa32dd5ddc04e313 Mon Sep 17 00:00:00 2001
From: Hironsan <hiroki.nakayama.py@gmail.com>
Date: Fri, 27 Jul 2018 16:23:56 +0900
Subject: [PATCH] Set pagination=None to ProjectsAPI

---
 app/server/static/bundle/projects.js | 2 +-
 app/server/static/js/projects.js     | 4 +---
 app/server/views.py                  | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/server/static/bundle/projects.js b/app/server/static/bundle/projects.js
index a1da8d9e..24acb203 100644
--- a/app/server/static/bundle/projects.js
+++ b/app/server/static/bundle/projects.js
@@ -150,7 +150,7 @@ eval("var g;\n\n// This works in non-strict mode\ng = (function() {\n\treturn th
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! vue */ \"./node_modules/vue/dist/vue.esm.js\");\n\n\nvar vm = new vue__WEBPACK_IMPORTED_MODULE_0__[\"default\"]({\n    el: '#projects_root',\n    delimiters: ['[[', ']]'],\n    data: {\n        items: [],\n        selectedType: 'All'\n    },\n    methods: {\n        get_projects: async function () {\n            var base_url = window.location.href.split('/').slice(0, 3).join('/');\n            await axios.get(`${base_url}/api/projects`).then(response => {\n                this.items = response.data['results'];\n                console.log(this.items);\n            })\n        },\n        updateSelectedType: function (type) {\n            this.selectedType = type;\n            console.log(this.selectedType);\n        }\n    },\n    computed: {\n        uniqueProjectTypes: function () {\n            var types = [];\n            for (var item of this.items) {\n                types.push(item.project_type)\n            }\n            var uniqueTypes = Array.from(new Set(types));\n\n            return uniqueTypes\n        },\n        filteredProjects: function () {\n            // filter projects\n            var projects = [];\n            for (var item of this.items) {\n                if ((this.selectedType == 'All') || (item.project_type == this.selectedType)) {\n                    projects.push(item)\n                }\n            }\n            // create nested projects\n            var nested_projects = [];\n            for (var i = 0; i < projects.length % 3; i++) {\n                var p = projects.slice(i * 3, (i + 1) * 3);\n                nested_projects.push(p);\n            }\n\n            return nested_projects\n        }\n    },\n    created: function () {\n        this.get_projects();\n    }\n});\n\n//# sourceURL=webpack:///./static/js/projects.js?");
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! vue */ \"./node_modules/vue/dist/vue.esm.js\");\n\n\nvar vm = new vue__WEBPACK_IMPORTED_MODULE_0__[\"default\"]({\n    el: '#projects_root',\n    delimiters: ['[[', ']]'],\n    data: {\n        items: [],\n        selectedType: 'All'\n    },\n    methods: {\n        get_projects: async function () {\n            var base_url = window.location.href.split('/').slice(0, 3).join('/');\n            await axios.get(`${base_url}/api/projects`).then(response => {\n                this.items = response.data;\n            })\n        },\n        updateSelectedType: function (type) {\n            this.selectedType = type;\n        }\n    },\n    computed: {\n        uniqueProjectTypes: function () {\n            var types = [];\n            for (var item of this.items) {\n                types.push(item.project_type)\n            }\n            var uniqueTypes = Array.from(new Set(types));\n\n            return uniqueTypes\n        },\n        filteredProjects: function () {\n            // filter projects\n            var projects = [];\n            for (var item of this.items) {\n                if ((this.selectedType == 'All') || (item.project_type == this.selectedType)) {\n                    projects.push(item)\n                }\n            }\n            // create nested projects\n            var nested_projects = [];\n            for (var i = 0; i < projects.length % 3; i++) {\n                var p = projects.slice(i * 3, (i + 1) * 3);\n                nested_projects.push(p);\n            }\n\n            return nested_projects\n        }\n    },\n    created: function () {\n        this.get_projects();\n    }\n});\n\n//# sourceURL=webpack:///./static/js/projects.js?");
 
 /***/ })
 
diff --git a/app/server/static/js/projects.js b/app/server/static/js/projects.js
index be1504d4..1ce11cf9 100644
--- a/app/server/static/js/projects.js
+++ b/app/server/static/js/projects.js
@@ -11,13 +11,11 @@ var vm = new Vue({
         get_projects: async function () {
             var base_url = window.location.href.split('/').slice(0, 3).join('/');
             await axios.get(`${base_url}/api/projects`).then(response => {
-                this.items = response.data['results'];
-                console.log(this.items);
+                this.items = response.data;
             })
         },
         updateSelectedType: function (type) {
             this.selectedType = type;
-            console.log(this.selectedType);
         }
     },
     computed: {
diff --git a/app/server/views.py b/app/server/views.py
index 0d4776d6..822e317f 100644
--- a/app/server/views.py
+++ b/app/server/views.py
@@ -73,6 +73,7 @@ class DataDownloadAPI(View):
 class ProjectViewSet(viewsets.ModelViewSet):
     queryset = Project.objects.all()
     serializer_class = ProjectSerializer
+    pagination_class = None
 
     @action(methods=['get'], detail=True)
     def progress(self, request, pk=None):