kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

New stuff pertaining to the import procedure and user registration.

Browse Source
This commit is contained in:
James Cole
2014-07-05 16:19:15 +02:00
parent c3254c2351
commit a0c0dc288d
23 changed files with 305 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/models/User.php
View File

@@ -1,9 +1,9 @@
<?php
use Illuminate\Auth\UserTrait;
use Illuminate\Auth\UserInterface;
use Illuminate\Auth\Reminders\RemindableTrait;
use Illuminate\Auth\Reminders\RemindableInterface;
use Illuminate\Auth\Reminders\RemindableTrait;
use Illuminate\Auth\UserInterface;
use Illuminate\Auth\UserTrait;
class User extends Elegant implements UserInterface, RemindableInterface
{
@@ -11,21 +11,19 @@ class User extends Elegant implements UserInterface, RemindableInterface
use UserTrait, RemindableTrait;
public static $rules
= [
'email' => 'required|email|unique:users,email',
'migrated' => 'required|numeric|between:0,1',
'password' => 'required|between:60,60',
'reset' => 'between:32,32',
];
/**
* The database table used by the model.
*
* @var string
*/
protected $table = 'users';
public static $rules
= [
'email' => 'required|email|unique:users,email',
'migrated' => 'required|numeric|between:0,1',
'password' => 'required|between:60,60',
'verification' => 'between:32,32',
];
/**
* The attributes excluded from the model's JSON form.
*
@@ -33,7 +31,8 @@ class User extends Elegant implements UserInterface, RemindableInterface
*/
protected $hidden = array('remember_token');
public function accounts() {
public function accounts()
{
return $this->hasMany('Account');
}