will/Open-Source-Access-Control-Web-Interface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding note to macs json feed

Browse Source
This commit is contained in:
Will Bradley 2013-02-09 05:05:06 -07:00
parent 0ced399651
commit 3fb774d057
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/macs_controller.rb
View File

@ -26,7 +26,7 @@ def index
respond_to do |format| respond_to do |format|
format.html format.html
format.json { format.json {
@filtered_macs = Mac.select("macs.mac, users.name").where("macs.active = ? AND (macs.hidden IS NULL OR macs.hidden = ?)", true, false).joins(:user) @filtered_macs = Mac.select("macs.mac, users.name, macs.note").where("macs.active = ? AND (macs.hidden IS NULL OR macs.hidden = ?)", true, false).joins(:user)
render :json => @filtered_macs render :json => @filtered_macs
} }
end end