135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix oui join type and improve search comments

Browse Source
This commit is contained in:
Oliver Gorwits
2012-01-21 00:02:37 +00:00
parent f574cd1db5
commit f844938a65
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/lib/Netdisco/DB/Result/NodeIp.pm
View File

@@ -69,6 +69,7 @@ __PACKAGE__->belongs_to( oui => 'Netdisco::DB::Result::Oui',
{ '=' => \"substring(cast($args->{self_alias}.mac as varchar) for 8)" } { '=' => \"substring(cast($args->{self_alias}.mac as varchar) for 8)" }
}; };
} }
, { join_type => 'LEFT' }
); );
__PACKAGE__->has_many( node_ips => 'Netdisco::DB::Result::NodeIp', __PACKAGE__->has_many( node_ips => 'Netdisco::DB::Result::NodeIp',

2
Netdisco/views/index.tt
View File

@@ -34,7 +34,7 @@
[% ELSE %] [% ELSE %]
<div class="alert-message success fade in" data-alert="on"> <div class="alert-message success fade in" data-alert="on">
<a class="close" href="#">×</a> <a class="close" href="#">×</a>
<p>Hit <strong>Enter</strong> in the Search box to view the current Inventory.</p> <p>Hit <strong>Enter</strong> in the Search box to view the current Inventory (<em>temporary feature</em>).</p>
</div> </div>
[% END %] [% END %]
<div class="hero-unit"> <div class="hero-unit">

2
Netdisco/views/layouts/main.tt
View File

@@ -57,7 +57,7 @@
[% END %] [% END %]
</ul> </ul>
<form method="get" action="[% uri_for('/search') %]"> <form method="get" action="[% uri_for('/search') %]">
<input placeholder="Search" class="span5" name="q" type="text"/> <input placeholder="Device, Node or VLAN Search" class="span5" name="q" type="text"/>
</form> </form>
<ul class="nav secondary-nav"> <ul class="nav secondary-nav">
<li class="menu"> <li class="menu">