Merged development into master

This commit is contained in:
NelsonLaQuet 2013-09-01 02:58:36 -05:00
commit 1a6169a0c0

View file

@ -73,17 +73,7 @@
} }
public function getOwned() { public function getOwned() {
$query = Track::summary()->where('user_id', \Auth::user()->id); $query = Track::summary()->where('user_id', \Auth::user()->id)->orderBy('created_at', 'desc');
if (Input::has('published')) {
$published = \Input::get('published');
if ($published)
$query->whereNotNull('published_at');
else
$query->whereNull('published_at');
}
$this->applyFilters($query);
$tracks = []; $tracks = [];
foreach ($query->get() as $track) foreach ($query->get() as $track)