mirror of
https://github.com/Karaka-Management/oms-Admin.git
synced 2026-02-13 03:08:39 +00:00
bug fixes / dbmapper fixes
This commit is contained in:
parent
2a764a1545
commit
bd25adaa6e
|
|
@ -1074,8 +1074,6 @@ final class ApiController extends Controller
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$old = clone $account;
|
|
||||||
|
|
||||||
$this->app->moduleManager->get('Profile')->apiProfileCreateDbEntry(
|
$this->app->moduleManager->get('Profile')->apiProfileCreateDbEntry(
|
||||||
new \Modules\Profile\Models\Profile($account),
|
new \Modules\Profile\Models\Profile($account),
|
||||||
$request
|
$request
|
||||||
|
|
|
||||||
|
|
@ -340,7 +340,7 @@ final class BackendController extends Controller
|
||||||
$id = $request->getData('id') ?? '';
|
$id = $request->getData('id') ?? '';
|
||||||
$view->setData('modules', $this->app->moduleManager->getAllModules());
|
$view->setData('modules', $this->app->moduleManager->getAllModules());
|
||||||
$view->setData('active', $this->app->moduleManager->getActiveModules());
|
$view->setData('active', $this->app->moduleManager->getActiveModules());
|
||||||
$view->setData('installed', $installed = $this->app->moduleManager->getInstalledModules());
|
$view->setData('installed',$this->app->moduleManager->getInstalledModules());
|
||||||
$view->setData('id', $id);
|
$view->setData('id', $id);
|
||||||
|
|
||||||
$type = 'Help';
|
$type = 'Help';
|
||||||
|
|
|
||||||
|
|
@ -144,12 +144,12 @@ final class AccountMapperTest extends \PHPUnit\Framework\TestCase
|
||||||
/** @var Account $accountR */
|
/** @var Account $accountR */
|
||||||
$accountR = AccountMapper::get()->where('id', 1)->execute();
|
$accountR = AccountMapper::get()->where('id', 1)->execute();
|
||||||
TestUtils::setMember($accountR, 'password', '');
|
TestUtils::setMember($accountR, 'password', '');
|
||||||
AccountMapper::update()->execute($accountR);
|
AccountMapper::update()->with('password')->execute($accountR);
|
||||||
|
|
||||||
self::assertEquals(LoginReturnType::EMPTY_PASSWORD, AccountMapper::login($accountR->login, 'orange'));
|
self::assertEquals(LoginReturnType::EMPTY_PASSWORD, AccountMapper::login($accountR->login, 'orange'));
|
||||||
|
|
||||||
$accountR->generatePassword('orange');
|
$accountR->generatePassword('orange');
|
||||||
AccountMapper::update()->execute($accountR);
|
AccountMapper::update()->with('password')->execute($accountR);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user