Nick,
I moved the usage of the shared/{parameters,groups,classes} to the second
commit, and made the changes I mentioned in my comments. The diff between the
two endpoints of our branches is below.
Branch also available at:
git://github.com/jhelwig/puppet-dashboard.git feature/next/3531
--
Jacob Helwig
app/models/node.rb | 6 ------
app/views/node_classes/show.html.haml | 2 +-
app/views/node_groups/show.html.haml | 4 ++--
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/app/models/node.rb b/app/models/node.rb
index 299bad8..0ca6060 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -118,12 +118,6 @@ class Node < ActiveRecord::Base
TimelineEvent.for_node(self)
end
- # Placeholder attributes
-
- def environment
- 'production'
- end
-
def status_class
return 'no reports' unless last_report
last_report.status
diff --git a/app/views/node_classes/show.html.haml
b/app/views/node_classes/show.html.haml
index c792214..6a4ea50 100644
--- a/app/views/node_classes/show.html.haml
+++ b/app/views/node_classes/show.html.haml
@@ -15,6 +15,6 @@
.section
%h3 Nodes in this class
- if @node_class.nodes.present?
- = render 'nodes/nodes', :nodes => @node_class.node_list.map(&:first),
:container => @node_class
+ = render 'nodes/nodes', :nodes => @node_class.node_list.keys,
:container => @node_class
- else
= describe_no_matches_for :nodes, :class
diff --git a/app/views/node_groups/show.html.haml
b/app/views/node_groups/show.html.haml
index 3a9743d..acb2af2 100644
--- a/app/views/node_groups/show.html.haml
+++ b/app/views/node_groups/show.html.haml
@@ -29,7 +29,7 @@
%td
= parents.map{|p| link_to(p.name,p)}.join(", ") unless
parents.include?(@node_group)
- else
- = describe_no_matches_as 'No child groups'
+ = describe_no_matches_as 'No derived groups'
.item
- if @node_group.nodes.present?
.section
@@ -37,6 +37,6 @@
.section
%h3 Nodes for this group
- if @node_group.nodes.present?
- = render 'nodes/nodes', :nodes => @node_group.node_list.map(&:first),
:container => @node_group
+ = render 'nodes/nodes', :nodes => @node_group.node_list.keys,
:container => @node_group
- else
= describe_no_matches_for :nodes, :group
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
