mcndave
/
lean-console
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.mcnd.ca/mcndave/lean-console

This commit is contained in:
Dave M. 2022-11-29 19:44:39 +00:00
parent 24e5490c71 94b5aff9e9
commit 9c8f9903fc
3 changed files with 28 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Form/Database.php
View File

@ -34,29 +34,13 @@ class Database implements FormInterface
continue;
}
$tableEntity = $adapter->schemaTable($databaseName, $tableName);
$tableEntity = $adapter->schemaTable($databaseName, $tableName);
if ( $tableEntity ) {
#$fields = $entiy::resolveEntity()->fieldList();
foreach($tableEntity->columns as $col) {
//dump( $entity::field($col->name) );
#=======
# $table = Table::repository()
# ->where(Table::field('name'), $table->tableName())
# ->where(Table::field('schema'), $table->databaseName())
# ->loadOne();
# if ( $table ) {
# $fields = $entity::resolveEntity()->fieldList(EntityResolver::KEY_COLUMN_NAME, true);
# $alter = [];
# foreach($fields as $field => $definition) {
# if ( $table->columns->filtersCollection(fn($e) => $e->name === $field)->count() === 0 ) {
# $alter[$field] = $definition;
# }
#>>>>>>> 7194a33bec884d745e838c8ac2693b353e95a3ce
foreach($tableEntity->columns as $field => $definition) {
# if ( $table->columns->filtersCollection(fn($e) => $e->name === $field)->count() === 0 ) {
# $alter[$field] = $definition;
#}
}
$alter =false;

1
src/Lib/ConsoleControllerTrait.php
View File

@ -13,6 +13,7 @@ use Picea;
* @RouteParam("methods" => [ 'GET', 'POST', 'DELETE' ], "base" => "/~")
* @Security('locked' => false)
* @Taxus("dev")
* #Taxus("admin")
*/
trait ConsoleControllerTrait
{

45
view/lean-console/page/storage/database.phtml
View File

@ -10,29 +10,29 @@
{% section "content" %}
<section>
<header>
<h1>{% _ 'database.header' %}</h1>
</header>
{% if $connections %}
{% foreach $connections as $connection %}
{% php $conf = $connection->getConfiguration(); %}
<article class="databases">
{% if $connections %}
<strong class="grid db-grid">
<div class="col db-connection">{% _ 'database.connection' %}</div>
<div class="col db-adapter">{% _ 'database.adapter' %}</div>
<div class="col db-host">{% _ 'database.host' %}</div>
<div class="col db-name">{% _ 'database.name' %}</div>
<div class="col db-username">{% _ 'database.username' %}</div>
</strong>
<header>
<h1>{{ $connection->name }}</h1>
</header>
{% foreach $connections as $connection %}
{% php $conf = $connection->getConfiguration(); %}
<article class="databases">
<strong class="grid db-grid">
<div class="col db-connection">{% _ 'database.connection' %}</div>
<div class="col db-adapter">{% _ 'database.adapter' %}</div>
<div class="col db-host">{% _ 'database.host' %}</div>
<div class="col db-name">{% _ 'database.name' %}</div>
<div class="col db-username">{% _ 'database.username' %}</div>
</strong>
<div class="grid db-grid">
<div class="col db-connection">{{ $connection->name }}</div>
<div class="col db-adapter">{{ $conf['adapter'] ?? null }}</div>
<div class="col db-host">{{ $conf['host'] ?? null }}:{{ $conf['port'] ?? null }}</div>
<div class="col db-name">{{ $conf['database'] ?? null }}</div>
<div class="col db-username">{{ $conf['username'] ?? null }}</div>
<div class="col db-connection"></div>
<div class="col db-adapter">{{ $conf['adapter'] ?? '-' }}</div>
<div class="col db-host">{{ $conf['host'] ?? '-' }}:{{ $conf['port'] ?? '-' }}</div>
<div class="col db-name">{{ $conf['database'] ?? '-' }}</div>
<div class="col db-username">{{ $conf['username'] ?? '-' }}</div>
</div>
<div class="tables">
@ -85,10 +85,9 @@
{% endif %}
{% ui.endform %}
</div>
{% endforeach %}
{% endif %}
</article>
</article>
{% endforeach %}
{% endif %}
</section>
<style>