starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-28 17:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace all of getById functions with Model::find

Browse Source
This commit is contained in:
DariusIII
2018-02-02 11:36:13 +01:00
parent 54b26cfd70
commit 3ccdbc7e6c
12 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Changelog
+1
View File
@@ -1,4 +1,5 @@
2018-02-02 DariusIII
* Chg: Replace all of getById functions with Model::find
* Fix: Fix getByIdAndRssToken function
* Chg: Use replace getById user lookup with User model find built in function(does the same thing as custom function)
2018-02-01 DariusIII
app/Models/Category.php
-15
View File
@@ -325,21 +325,6 @@ class Category extends Model
->get(['id']);
}
/**
* Get a category row by its id.
*
*
* @param $id
* @return \Illuminate\Database\Eloquent\Model|null|static
*/
public static function getById($id)
{
return self::query()
->with('parent')
->where('id', $id)
->first();
}
/**
* Get multiple categories.
*
nntmux/Releases.php
+1 -1
View File
@@ -1098,7 +1098,7 @@ class Releases
{
// Get the category for the parent of this release.
$currRow = Release::getCatByRelId($currentID);
$catRow = Category::getById($currRow['categories_id']);
$catRow = Category::find($currRow['categories_id']);
$parentCat = $catRow['parentid'];
$results = $this->search(
public/admin/category-edit.php
+1 -1
View File
@@ -21,7 +21,7 @@ switch ($action) {
if (isset($_GET['id'])) {
$page->title = 'Category Edit';
$id = $_GET['id'];
$cat = Category::getById($id);
$cat = Category::find($id);
$page->smarty->assign('category', $cat);
}
break;
public/admin/menu-edit.php
+1 -1
View File
@@ -37,7 +37,7 @@ switch ($action) {
];
if (isset($_GET['id'])) {
$id = $_GET['id'];
$menuRow = Menu::getById($id);
$menuRow = Menu::find($id);
}
$page->title = 'Menu Edit';
$page->smarty->assign('menu', $menuRow);
public/pages/books.php
+1 -1
View File
@@ -65,7 +65,7 @@ $page->smarty->assign('pager', $pager);
if ((int) $category === -1) {
$page->smarty->assign('catname', 'All');
} else {
$cdata = Category::getById($category);
$cdata = Category::find($category);
if ($cdata) {
$page->smarty->assign('catname', $cdata->parent !== null ? $cdata->parent->title.' > '.$cdata->title : $cdata->title);
} else {
public/pages/browse.php
+2 -2
View File
@@ -47,10 +47,10 @@ $pager = $page->smarty->fetch('pager.tpl');
$page->smarty->assign('pager', $pager);
$covgroup = '';
if ($category === -1 && (int) $grp === -1) {
if ((int) $category === -1 && (int) $grp === -1) {
$page->smarty->assign('catname', 'All');
} elseif ((int) $category !== -1 && (int) $grp === -1) {
$cdata = Category::getById($category);
$cdata = Category::find($category);
if ($cdata) {
$page->smarty->assign('catname', $cdata->parent !== null ? $cdata->parent->title.' > '.$cdata->title : $cdata->title);
if ($cdata['parentid'] === Category::GAME_ROOT || $cdata['id'] === Category::GAME_ROOT) {
public/pages/console.php
+1 -1
View File
@@ -76,7 +76,7 @@ $page->smarty->assign('pager', $pager);
if ((int) $category === -1) {
$page->smarty->assign('catname', 'All');
} else {
$cdata = Category::getById($category);
$cdata = Category::find($category);
if ($cdata) {
$page->smarty->assign('catname', $cdata->parent !== null ? $cdata->parent->title.' > '.$cdata->title : $cdata->title);
} else {
public/pages/games.php
+2 -2
View File
@@ -81,10 +81,10 @@ $page->smarty->assign('pagerquerysuffix', '#results');
$pager = $page->smarty->fetch('pager.tpl');
$page->smarty->assign('pager', $pager);
if ($category == -1) {
if ((int) $category === -1) {
$page->smarty->assign('catname', 'All');
} else {
$cdata = Category::getById($category);
$cdata = Category::find($category);
if ($cdata) {
$page->smarty->assign('catname', $cdata->parent !== null ? $cdata->parent->title.' > '.$cdata->title : $cdata->title);
} else {
public/pages/movies.php
+2 -2
View File
@@ -86,10 +86,10 @@ $page->smarty->assign('pagerquerysuffix', '#results');
$pager = $page->smarty->fetch('pager.tpl');
$page->smarty->assign('pager', $pager);
if ($category == -1) {
if ((int) $category === -1) {
$page->smarty->assign('catname', 'All');
} else {
$cdata = Category::getById($category);
$cdata = Category::find($category);
if ($cdata) {
$page->smarty->assign('catname', $cdata->parent !== null ? $cdata->parent->title.' > '.$cdata->title : $cdata->title);
} else {
public/pages/music.php
+2 -2
View File
@@ -73,10 +73,10 @@ $page->smarty->assign('pagerquerysuffix', '#results');
$pager = $page->smarty->fetch('pager.tpl');
$page->smarty->assign('pager', $pager);
if ($category == -1) {
if ((int) $category === -1) {
$page->smarty->assign('catname', 'All');
} else {
$cdata = Category::getById($category);
$cdata = Category::find($category);
if ($cdata) {
$page->smarty->assign('catname', $cdata->parent !== null ? $cdata->parent->title.' > '.$cdata->title : $cdata->title);
} else {
public/pages/xxx.php
+1 -1
View File
@@ -65,7 +65,7 @@ $page->smarty->assign('pager', $pager);
if ((int) $category === -1) {
$page->smarty->assign('catname', 'All');
} else {
$cdata = Category::getById($category);
$cdata = Category::find($category);
if ($cdata) {
$page->smarty->assign('catname', $cdata->parent !== null ? $cdata->parent->title.' > '.$cdata->title : $cdata->title);
} else {