Skip to content

Commit 8cafe65

Browse files
committed
reset task-list viwe
1 parent 5dd7826 commit 8cafe65

File tree

2 files changed

+8
-19
lines changed

2 files changed

+8
-19
lines changed

lib/code_corps_web/controllers/task_list_controller.ex

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ defmodule CodeCorpsWeb.TaskListController do
33
use CodeCorpsWeb, :controller
44

55
alias CodeCorps.{Helpers.Query, TaskList}
6-
alias CodeCorpsWeb.{TaskListView}
76

87
action_fallback CodeCorpsWeb.FallbackController
98
plug CodeCorpsWeb.Plug.DataToAttributes
@@ -19,13 +18,13 @@ defmodule CodeCorpsWeb.TaskListController do
1918
|> Repo.all()
2019
|> preload()
2120

22-
conn |> render(TaskListView, "index.json-api", %{data: task_lists, conn: conn})
21+
conn |> render("index.json-api", data: task_lists)
2322
end
2423

2524
@spec show(Conn.t, map) :: Conn.t
2625
def show(%Conn{} = conn, %{"id" => id}) do
2726
with %TaskList{} = task_list <- TaskList |> Repo.get(id) |> preload() do
28-
conn |> render(TaskListView, "show.json-api", %{data: task_list, conn: conn, params: id})
27+
conn |> render("show.json-api", data: task_list)
2928
end
3029
end
3130

@@ -34,4 +33,4 @@ defmodule CodeCorpsWeb.TaskListController do
3433
def preload(data) do
3534
Repo.preload(data, @preloads)
3635
end
37-
end
36+
end
+5-15
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
11
defmodule CodeCorpsWeb.TaskListView do
22
@moduledoc false
33
use CodeCorpsWeb, :view
4-
use JSONAPI.View, type: "task-list"
4+
use JaSerializer.PhoenixView
55

6-
alias CodeCorpsWeb.{ProjectView, TaskView}
6+
attributes [:done, :inbox, :name, :order, :pull_requests, :inserted_at, :updated_at]
77

8-
def render("index.json-api", %{data: task_list, conn: conn}) do
9-
__MODULE__.index(task_list, conn, nil)
10-
end
8+
has_one :project, type: "project", field: :project_id
119

12-
def render("show.json-api", %{data: task_list, conn: conn, params: params}) do
13-
__MODULE__.show(task_list, conn, params)
14-
end
15-
16-
def fields, do: [:done, :inbox, :name, :order, :pull_requests, :inserted_at, :updated_at]
17-
18-
# def relationships do
19-
# [project: ProjectView, tasks: TaskView]
20-
# end
21-
end
10+
has_many :tasks, serializer: CodeCorpsWeb.TaskView, identifiers: :always
11+
end

0 commit comments

Comments
 (0)