From 8032c8e93ed2343f27e3613c80271ddd8d77bba9 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Mon, 24 Aug 2015 16:02:55 +0100 Subject: [PATCH 1/2] Account goes to user profile --- app/views/widgets/_logged.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/widgets/_logged.html.erb b/app/views/widgets/_logged.html.erb index 3a49932..c6f7842 100644 --- a/app/views/widgets/_logged.html.erb +++ b/app/views/widgets/_logged.html.erb @@ -9,7 +9,7 @@ <% end %>
  • - <%= link_to edit_user_path(cuser) do %> + <%= link_to user_path(cuser) do %> Account <%= icon 'user' %> <% end %>
    • From f05f072f1c60ea74542db8e5fc52f16c0cbfb4b3 Mon Sep 17 00:00:00 2001 From: Chris Blanchard Date: Thu, 27 Aug 2015 11:58:30 +0100 Subject: [PATCH 2/2] Return server name --- app/controllers/api/v1/servers_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/v1/servers_controller.rb b/app/controllers/api/v1/servers_controller.rb index fe5a6cf..e2b39ee 100644 --- a/app/controllers/api/v1/servers_controller.rb +++ b/app/controllers/api/v1/servers_controller.rb @@ -6,9 +6,10 @@ class Api::V1::ServersController < Api::V1::BaseController private def active_servers - Server.active.map do |s| + Server.active.map do |s| { id: s.id, + name: s.name, description: s.description, dns: s.dns, ip: s.ip,