From f6b0cda9ec0b66f2cbfdb8075785ab6fd266862b Mon Sep 17 00:00:00 2001 From: Jeramy Simpson Date: Wed, 18 Mar 2015 09:39:03 +1000 Subject: [PATCH] Update Namespaces --- app/Models/Account.php | 2 +- app/Models/AccountGateway.php | 2 +- app/Models/AccountGatewayToken.php | 2 +- app/Models/AccountToken.php | 2 +- app/Models/Activity.php | 2 +- app/Models/Affiliate.php | 2 +- app/Models/Client.php | 2 +- app/Models/Contact.php | 2 +- app/Models/Country.php | 2 +- app/Models/Credit.php | 2 +- app/Models/Currency.php | 2 +- app/Models/DateFormat.php | 2 +- app/Models/DatetimeFormat.php | 2 +- app/Models/EntityModel.php | 2 +- app/Models/Frequency.php | 2 +- app/Models/Gateway.php | 2 +- app/Models/Industry.php | 2 +- app/Models/Invitation.php | 2 +- app/Models/Invoice.php | 2 +- app/Models/InvoiceDesign.php | 2 +- app/Models/InvoiceItem.php | 2 +- app/Models/InvoiceStatus.php | 2 +- app/Models/Language.php | 2 +- app/Models/License.php | 2 +- app/Models/Payment.php | 2 +- app/Models/PaymentLibrary.php | 2 +- app/Models/PaymentTerm.php | 2 +- app/Models/PaymentType.php | 2 +- app/Models/Product.php | 2 +- app/Models/Project.php | 5 ++- app/Models/ProjectCode.php | 5 ++- app/Models/Size.php | 2 +- app/Models/Subscription.php | 2 +- app/Models/TaxRate.php | 2 +- app/Models/Theme.php | 2 +- app/Models/Timesheet.php | 2 +- app/Models/TimesheetEvent.php | 5 ++- app/Models/TimesheetEventSource.php | 5 ++- app/Models/Timezone.php | 2 +- app/Models/User.php | 47 ++++++++++++++++------------- 40 files changed, 77 insertions(+), 60 deletions(-) diff --git a/app/Models/Account.php b/app/Models/Account.php index bbe026266a64..f944a6abf3ce 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -1,4 +1,4 @@ - 'required|unique:users', - 'password' => 'required|between:6,32|confirmed', - 'password_confirmation' => 'between:6,32', - */ - ); - - protected $updateRules = array( - /* - 'email' => 'required|unique:users', - 'username' => 'required|unique:users', - */ - ); - /** * The database table used by the model. * @@ -30,6 +19,22 @@ class User extends ConfideUser implements UserInterface, RemindableInterface */ protected $table = 'users'; + + /** + * The attributes that are mass assignable. + * + * @var array + */ + protected $fillable = ['email', 'password','agency_id']; + + /** + * The attributes excluded from the model's JSON form. + * + * @var array + */ + protected $hidden = ['password', 'remember_token']; + + public function account() { return $this->belongsTo('Account');