diff options
| author | mo khan <mo@mokhan.ca> | 2015-02-21 22:12:49 -0700 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2015-02-21 22:12:49 -0700 |
| commit | 7cd78597d794efcf79090377bbc1909a1d6d3ad9 (patch) | |
| tree | f4f55eb33be3912030c505198e67b1cba9ba2473 /app/views | |
| parent | feaf5cfae0f948ceebae4d1ff2c80d84cd76cae0 (diff) | |
| parent | 05b427bd4d9f9c4ea60f9485f06d68de0b689d28 (diff) | |
merge with master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/agents/index.html.erb | 7 | ||||
| -rw-r--r-- | app/views/api/agents/create.json.jbuilder (renamed from app/views/agents/show.json.jbuilder) | 0 | ||||
| -rw-r--r-- | app/views/api/agents/files/index.json.jbuilder (renamed from app/views/agents/files/index.json.jbuilder) | 0 | ||||
| -rw-r--r-- | app/views/api/agents/files/show.json.jbuilder (renamed from app/views/agents/files/show.json.jbuilder) | 0 | ||||
| -rw-r--r-- | app/views/api/agents/index.json.jbuilder (renamed from app/views/agents/index.json.jbuilder) | 0 | ||||
| -rw-r--r-- | app/views/dispositions/index.json.jbuilder | 4 | ||||
| -rw-r--r-- | app/views/dispositions/show.json.jbuilder | 1 |
7 files changed, 4 insertions, 8 deletions
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 @@ <thead> <tr> <th>Hostname</th> - <th colspan="4"></th> + <th>Created At</th> + <th colspan="3"></th> </tr> </thead> <tbody> <% @agents.each do |agent| %> <tr> - <td><%= agent.hostname %></td> + <td><%= link_to agent.hostname, agent_path(agent) %></td> + <td><%= agent.created_at %></td> <td><%= link_to 'Events', agent_events_path(agent) %></td> - <td><%= link_to 'Show', agent %></td> <td><%= link_to 'Edit', edit_agent_path(agent) %></td> <td><%= link_to 'Destroy', agent, method: :delete, data: { confirm: 'Are you sure?' } %></td> </tr> diff --git a/app/views/agents/show.json.jbuilder b/app/views/api/agents/create.json.jbuilder index f156cb0..f156cb0 100644 --- a/app/views/agents/show.json.jbuilder +++ b/app/views/api/agents/create.json.jbuilder diff --git a/app/views/agents/files/index.json.jbuilder b/app/views/api/agents/files/index.json.jbuilder index 6551a44..6551a44 100644 --- a/app/views/agents/files/index.json.jbuilder +++ b/app/views/api/agents/files/index.json.jbuilder diff --git a/app/views/agents/files/show.json.jbuilder b/app/views/api/agents/files/show.json.jbuilder index 8c6f501..8c6f501 100644 --- a/app/views/agents/files/show.json.jbuilder +++ b/app/views/api/agents/files/show.json.jbuilder diff --git a/app/views/agents/index.json.jbuilder b/app/views/api/agents/index.json.jbuilder index 65f6f60..65f6f60 100644 --- a/app/views/agents/index.json.jbuilder +++ b/app/views/api/agents/index.json.jbuilder 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 |