IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change preferences info.

Browse Source
This commit is contained in:
James Cole 2016-06-23 12:08:14 +02:00
parent 2c826451d1
commit fbf9e00208
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Models/Preference.php
View File

@ -24,7 +24,6 @@ use Illuminate\Database\Eloquent\Model;
* @property string $name
* @property string $name_encrypted
* @property string $data
* @property string $data_encrypted
* @property-read \FireflyIII\User $user
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereCreatedAt($value)
@ -41,7 +40,6 @@ class Preference extends Model
protected $dates = ['created_at', 'updated_at'];
protected $fillable = ['user_id', 'data', 'name'];
protected $hidden = ['data_encrypted', 'name_encrypted'];
/**
* @param $value
@ -50,10 +48,7 @@ class Preference extends Model
*/
public function getDataAttribute($value)
{
if (is_null($this->data_encrypted)) {
return json_decode($value);
}
$data = Crypt::decrypt($this->data_encrypted);
$data = Crypt::decrypt($value);
return json_decode($data);
}
@ -63,8 +58,7 @@ class Preference extends Model
*/
public function setDataAttribute($value)
{
$this->attributes['data'] = '';
$this->attributes['data_encrypted'] = Crypt::encrypt(json_encode($value));
$this->attributes['data'] = Crypt::encrypt(json_encode($value));
}
/**

4
app/Support/Preferences.php
View File

@ -69,7 +69,7 @@ class Preferences
return Cache::get($fullName);
}
$preference = Preference::where('user_id', $user->id)->where('name', $name)->first(['id', 'name', 'data_encrypted']);
$preference = Preference::where('user_id', $user->id)->where('name', $name)->first(['id', 'name', 'data']);
if ($preference) {
Cache::forever($fullName, $preference);
@ -138,7 +138,7 @@ class Preferences
{
$fullName = 'preference' . $user->id . $name;
Cache::forget($fullName);
$pref = Preference::where('user_id', $user->id)->where('name', $name)->first(['id', 'name', 'data_encrypted']);
$pref = Preference::where('user_id', $user->id)->where('name', $name)->first(['id', 'name', 'data']);
if (!is_null($pref)) {
$pref->data = $value;