From 8cafe655d1d1ee67b78fe742f6d76f7f720c5b80 Mon Sep 17 00:00:00 2001 From: snewcomer24 Date: Tue, 12 Dec 2017 11:53:08 -0800 Subject: [PATCH] reset task-list viwe --- .../controllers/task_list_controller.ex | 7 +++---- lib/code_corps_web/views/task_list_view.ex | 20 +++++-------------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/lib/code_corps_web/controllers/task_list_controller.ex b/lib/code_corps_web/controllers/task_list_controller.ex index e8444e4f0..08e91d671 100644 --- a/lib/code_corps_web/controllers/task_list_controller.ex +++ b/lib/code_corps_web/controllers/task_list_controller.ex @@ -3,7 +3,6 @@ defmodule CodeCorpsWeb.TaskListController do use CodeCorpsWeb, :controller alias CodeCorps.{Helpers.Query, TaskList} - alias CodeCorpsWeb.{TaskListView} action_fallback CodeCorpsWeb.FallbackController plug CodeCorpsWeb.Plug.DataToAttributes @@ -19,13 +18,13 @@ defmodule CodeCorpsWeb.TaskListController do |> Repo.all() |> preload() - conn |> render(TaskListView, "index.json-api", %{data: task_lists, conn: conn}) + conn |> render("index.json-api", data: task_lists) end @spec show(Conn.t, map) :: Conn.t def show(%Conn{} = conn, %{"id" => id}) do with %TaskList{} = task_list <- TaskList |> Repo.get(id) |> preload() do - conn |> render(TaskListView, "show.json-api", %{data: task_list, conn: conn, params: id}) + conn |> render("show.json-api", data: task_list) end end @@ -34,4 +33,4 @@ defmodule CodeCorpsWeb.TaskListController do def preload(data) do Repo.preload(data, @preloads) end -end +end \ No newline at end of file diff --git a/lib/code_corps_web/views/task_list_view.ex b/lib/code_corps_web/views/task_list_view.ex index 36d170b82..ae67fff17 100644 --- a/lib/code_corps_web/views/task_list_view.ex +++ b/lib/code_corps_web/views/task_list_view.ex @@ -1,21 +1,11 @@ defmodule CodeCorpsWeb.TaskListView do @moduledoc false use CodeCorpsWeb, :view - use JSONAPI.View, type: "task-list" + use JaSerializer.PhoenixView - alias CodeCorpsWeb.{ProjectView, TaskView} + attributes [:done, :inbox, :name, :order, :pull_requests, :inserted_at, :updated_at] - def render("index.json-api", %{data: task_list, conn: conn}) do - __MODULE__.index(task_list, conn, nil) - end + has_one :project, type: "project", field: :project_id - def render("show.json-api", %{data: task_list, conn: conn, params: params}) do - __MODULE__.show(task_list, conn, params) - end - - def fields, do: [:done, :inbox, :name, :order, :pull_requests, :inserted_at, :updated_at] - - # def relationships do - # [project: ProjectView, tasks: TaskView] - # end -end + has_many :tasks, serializer: CodeCorpsWeb.TaskView, identifiers: :always +end \ No newline at end of file