Closes #688 - Drop user_id column

This commit is contained in:
James Brooks
2015-06-10 13:33:00 +01:00
parent d9e515c62d
commit 620e7fed56
12 changed files with 78 additions and 27 deletions
@@ -16,7 +16,6 @@ use CachetHQ\Cachet\Models\Component;
use CachetHQ\Cachet\Models\ComponentGroup;
use CachetHQ\Cachet\Models\Tag;
use GrahamCampbell\Binput\Facades\Binput;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Redirect;
use Illuminate\Support\Facades\View;
@@ -116,7 +115,6 @@ class ComponentController extends AbstractController
public function updateComponentAction(Component $component)
{
$_component = Binput::get('component');
$_component['user_id'] = Auth::user()->id;
$tags = array_pull($_component, 'tags');
$component->update($_component);
@@ -185,7 +183,6 @@ class ComponentController extends AbstractController
public function createComponentAction()
{
$_component = Binput::get('component');
$_component['user_id'] = Auth::user()->id;
// We deal with tags separately.
$tags = array_pull($_component, 'tags');
@@ -18,7 +18,6 @@ use CachetHQ\Cachet\Models\ComponentGroup;
use CachetHQ\Cachet\Models\Incident;
use CachetHQ\Cachet\Models\IncidentTemplate;
use GrahamCampbell\Binput\Facades\Binput;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\Redirect;
use Illuminate\Support\Facades\View;
@@ -113,7 +112,6 @@ class IncidentController extends AbstractController
public function createIncidentAction()
{
$incidentData = Binput::get('incident');
$incidentData['user_id'] = Auth::user()->id;
$componentStatus = array_pull($incidentData, 'component_status');
if (array_has($incidentData, 'created_at') && $incidentData['created_at']) {
@@ -294,7 +292,6 @@ class IncidentController extends AbstractController
public function editIncidentAction(Incident $incident)
{
$incidentData = Binput::get('incident');
$incidentData['user_id'] = Auth::user()->id;
if (array_has($incidentData, 'created_at') && $incidentData['created_at']) {
$incidentDate = Date::createFromFormat('d/m/Y H:i', $incidentData['created_at'], Setting::get('app_timezone'))->setTimezone(Config::get('app.timezone'));
@@ -16,7 +16,6 @@ use CachetHQ\Cachet\Http\Controllers\AbstractController;
use CachetHQ\Cachet\Models\Incident;
use CachetHQ\Cachet\Models\IncidentTemplate;
use GrahamCampbell\Binput\Facades\Binput;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\Redirect;
use Illuminate\Support\Facades\View;
@@ -93,7 +92,6 @@ class ScheduleController extends AbstractController
public function addScheduleAction()
{
$scheduleData = Binput::get('incident');
$scheduleData['user_id'] = Auth::user()->id;
// Parse the schedule date.
$scheduledAt = Date::createFromFormat('d/m/Y H:i', $scheduleData['scheduled_at'], Setting::get('app_timezone'))
->setTimezone(Config::get('app.timezone'));
@@ -169,7 +167,6 @@ class ScheduleController extends AbstractController
public function editScheduleAction(Incident $schedule)
{
$scheduleData = Binput::get('incident');
$scheduleData['user_id'] = Auth::user()->id;
// Parse the schedule date.
$scheduledAt = Date::createFromFormat('d/m/Y H:i', $scheduleData['scheduled_at'], Setting::get('app_timezone'))
->setTimezone(Config::get('app.timezone'));
@@ -57,7 +57,6 @@ class ComponentController extends AbstractApiController
public function postComponents(Guard $auth)
{
$componentData = Binput::except('tags');
$componentData['user_id'] = $auth->user()->id;
try {
$component = Component::create($componentData);
@@ -57,7 +57,6 @@ class IncidentController extends AbstractApiController
public function postIncidents(Guard $auth)
{
$incidentData = Binput::all();
$incidentData['user_id'] = $auth->user()->id;
try {
$incident = Incident::create($incidentData);
-3
View File
@@ -19,7 +19,6 @@ use Watson\Validating\ValidatingTrait;
/**
* @property int $id
* @property int $user_id
* @property string $name
* @property string $description
* @property int $status
@@ -40,7 +39,6 @@ class Component extends Model implements HasPresenter
* @var string[]
*/
protected $rules = [
'user_id' => 'integer|required',
'name' => 'required|string',
'status' => 'integer|required',
'link' => 'url',
@@ -55,7 +53,6 @@ class Component extends Model implements HasPresenter
'name',
'description',
'status',
'user_id',
'tags',
'link',
'order',
-3
View File
@@ -23,7 +23,6 @@ use Watson\Validating\ValidatingTrait;
* @property string $name
* @property int $status
* @property string $message
* @property int $user_id
* @property \Carbon\Carbon $scheduled_at
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at
@@ -40,7 +39,6 @@ class Incident extends Model implements HasPresenter
* @var string[]
*/
protected $rules = [
'user_id' => 'required|integer',
'component_id' => 'integer',
'name' => 'required',
'status' => 'required|integer',
@@ -53,7 +51,6 @@ class Incident extends Model implements HasPresenter
* @var string[]
*/
protected $fillable = [
'user_id',
'component_id',
'name',
'status',