From 594d37bb40f3e3e0f15553383cf2a305d4d6742e Mon Sep 17 00:00:00 2001 From: mo khan Date: Mon, 9 Feb 2015 19:43:03 -0700 Subject: extract api. --- app/views/agents/files/index.json.jbuilder | 4 ---- app/views/agents/files/show.json.jbuilder | 6 ------ app/views/agents/index.json.jbuilder | 4 ---- app/views/agents/show.json.jbuilder | 1 - app/views/api/agents/create.json.jbuilder | 1 + app/views/api/agents/files/index.json.jbuilder | 4 ++++ app/views/api/agents/files/show.json.jbuilder | 6 ++++++ app/views/api/agents/index.json.jbuilder | 4 ++++ app/views/dispositions/index.json.jbuilder | 4 ---- app/views/dispositions/show.json.jbuilder | 1 - 10 files changed, 15 insertions(+), 20 deletions(-) delete mode 100644 app/views/agents/files/index.json.jbuilder delete mode 100644 app/views/agents/files/show.json.jbuilder delete mode 100644 app/views/agents/index.json.jbuilder delete mode 100644 app/views/agents/show.json.jbuilder create mode 100644 app/views/api/agents/create.json.jbuilder create mode 100644 app/views/api/agents/files/index.json.jbuilder create mode 100644 app/views/api/agents/files/show.json.jbuilder create mode 100644 app/views/api/agents/index.json.jbuilder delete mode 100644 app/views/dispositions/index.json.jbuilder delete mode 100644 app/views/dispositions/show.json.jbuilder (limited to 'app/views') diff --git a/app/views/agents/files/index.json.jbuilder b/app/views/agents/files/index.json.jbuilder deleted file mode 100644 index 6551a44..0000000 --- a/app/views/agents/files/index.json.jbuilder +++ /dev/null @@ -1,4 +0,0 @@ -json.array!(@files) do |file| - json.extract! agent, :fingerprint, :state - json.url agent_file_url([agent, file], format: :json) -end diff --git a/app/views/agents/files/show.json.jbuilder b/app/views/agents/files/show.json.jbuilder deleted file mode 100644 index 8c6f501..0000000 --- a/app/views/agents/files/show.json.jbuilder +++ /dev/null @@ -1,6 +0,0 @@ -if @file - json.extract! @file, :fingerprint, :state -else - json.fingerprint @fingerprint - json.state "unknown" -end diff --git a/app/views/agents/index.json.jbuilder b/app/views/agents/index.json.jbuilder deleted file mode 100644 index 65f6f60..0000000 --- a/app/views/agents/index.json.jbuilder +++ /dev/null @@ -1,4 +0,0 @@ -json.array!(@agents) do |agent| - json.extract! agent, :id, :hostname - json.url agent_url(agent, format: :json) -end diff --git a/app/views/agents/show.json.jbuilder b/app/views/agents/show.json.jbuilder deleted file mode 100644 index f156cb0..0000000 --- a/app/views/agents/show.json.jbuilder +++ /dev/null @@ -1 +0,0 @@ -json.extract! @agent, :id, :hostname, :created_at, :updated_at diff --git a/app/views/api/agents/create.json.jbuilder b/app/views/api/agents/create.json.jbuilder new file mode 100644 index 0000000..f156cb0 --- /dev/null +++ b/app/views/api/agents/create.json.jbuilder @@ -0,0 +1 @@ +json.extract! @agent, :id, :hostname, :created_at, :updated_at diff --git a/app/views/api/agents/files/index.json.jbuilder b/app/views/api/agents/files/index.json.jbuilder new file mode 100644 index 0000000..6551a44 --- /dev/null +++ b/app/views/api/agents/files/index.json.jbuilder @@ -0,0 +1,4 @@ +json.array!(@files) do |file| + json.extract! agent, :fingerprint, :state + json.url agent_file_url([agent, file], format: :json) +end diff --git a/app/views/api/agents/files/show.json.jbuilder b/app/views/api/agents/files/show.json.jbuilder new file mode 100644 index 0000000..8c6f501 --- /dev/null +++ b/app/views/api/agents/files/show.json.jbuilder @@ -0,0 +1,6 @@ +if @file + json.extract! @file, :fingerprint, :state +else + json.fingerprint @fingerprint + json.state "unknown" +end diff --git a/app/views/api/agents/index.json.jbuilder b/app/views/api/agents/index.json.jbuilder new file mode 100644 index 0000000..65f6f60 --- /dev/null +++ b/app/views/api/agents/index.json.jbuilder @@ -0,0 +1,4 @@ +json.array!(@agents) do |agent| + json.extract! agent, :id, :hostname + json.url agent_url(agent, format: :json) +end diff --git a/app/views/dispositions/index.json.jbuilder b/app/views/dispositions/index.json.jbuilder deleted file mode 100644 index d4350e1..0000000 --- a/app/views/dispositions/index.json.jbuilder +++ /dev/null @@ -1,4 +0,0 @@ -json.array!(@dispositions) do |disposition| - json.extract! disposition, :fingerprint, :state - json.url disposition_url(disposition, format: :json) -end diff --git a/app/views/dispositions/show.json.jbuilder b/app/views/dispositions/show.json.jbuilder deleted file mode 100644 index 7046781..0000000 --- a/app/views/dispositions/show.json.jbuilder +++ /dev/null @@ -1 +0,0 @@ -json.extract! @disposition, :fingerprint, :state -- cgit v1.2.3 From 64dd29d70ddda6f4927e9352e3e90c4f87b5041a Mon Sep 17 00:00:00 2001 From: mo khan Date: Mon, 9 Feb 2015 20:00:21 -0700 Subject: display created at for agents and sort by created_at descending. --- app/controllers/agents_controller.rb | 2 +- app/views/agents/index.html.erb | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'app/views') diff --git a/app/controllers/agents_controller.rb b/app/controllers/agents_controller.rb index 4acef9d..dc2717a 100644 --- a/app/controllers/agents_controller.rb +++ b/app/controllers/agents_controller.rb @@ -1,6 +1,6 @@ class AgentsController < ApplicationController def index - @agents = Agent.all + @agents = Agent.all.order(created_at: :desc) end def show diff --git a/app/views/agents/index.html.erb b/app/views/agents/index.html.erb index 3a6b738..75adfdb 100644 --- a/app/views/agents/index.html.erb +++ b/app/views/agents/index.html.erb @@ -9,15 +9,16 @@ Hostname - + Created At + <% @agents.each do |agent| %> - <%= agent.hostname %> + <%= link_to agent.hostname, agent_path(agent) %> + <%= agent.created_at %> <%= link_to 'Events', agent_events_path(agent) %> - <%= link_to 'Show', agent %> <%= link_to 'Edit', edit_agent_path(agent) %> <%= link_to 'Destroy', agent, method: :delete, data: { confirm: 'Are you sure?' } %> -- cgit v1.2.3