pnx/httpcb
Archived
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' into 31-admin-user-management

Browse source 
# Conflicts:
#	app/forms/UserSettings.php
This commit is contained in:
Henrik Hautakoski 2022-08-08 23:35:37 +02:00
commit 4b750f0f37
70 changed files with 7831 additions and 5620 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/Data/Base.php
View file

@ -18,7 +18,7 @@ class Base extends Model
* @param boolean $allFields
* @return bool
*/
public function hasChanged($fieldName = null, $allFields = false)
public function hasChanged($fieldName = null, bool $allFields = false) : bool
{
return $this->hasSnapshotData() === false
|| parent::hasChanged($fieldName, $allFields);

13
app/models/Data/Callback.php
View file

@ -216,6 +216,9 @@ class Callback extends Model
*/
public function initialize()
{
// Set table name mapped in the model.
$this->setSource('callback');
$this->useDynamicUpdate(true);
$this->hasMany('id', RequestMeta::class, 'callbackid', array('foreignKey' => true, 'alias' => 'Requests'));
@ -227,16 +230,6 @@ class Callback extends Model
)));
}
/**
* Returns table name mapped in the model.
*
* @return string
*/
public function getSource()
{
return 'callback';
}
public function getRequestPaginator($page = 1, $limit = 30)
{
return RequestMeta::getPaginator($this, $page, $limit);