Two asset maintence related fixes (#3101)
* Fix maintenances create button, and post to the proper route in maintences edit * Fix consumable tab when active. * Fix an html formatting error that resulted in us not closing a form. This would cause the checkin page to try to submit a delete request (related to the modal form) rather than the desired checkin request. Also fix formatting in this file. * Use log mail driver for testing, should fix the functional issue. Disable acceptance tests on travis for now. * Fix Category edit page. * EOL Can be null.
This commit is contained in:
@@ -103,12 +103,9 @@ class CategoriesController extends Controller
|
||||
// Redirect to the blogs management page
|
||||
return redirect()->to('admin/settings/categories')->with('error', trans('admin/categories/message.does_not_exist'));
|
||||
}
|
||||
|
||||
$category_options = array('' => 'Top Level') + DB::table('categories')->where('id', '!=', $categoryId)->lists('name', 'id');
|
||||
$category_types= Helper::categoryTypeList();
|
||||
|
||||
return View::make('categories/edit', compact('item'))
|
||||
->with('category_options', $category_options)
|
||||
->with('category_types', $category_types);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user