StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Model updates for Database Management in ACP

Browse source
This commit is contained in:
Dane Everitt 2017-02-03 15:19:14 -05:00
parent 9c2d34d6e6
commit 96d3aa767f
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
7 changed files with 137 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

33
resources/views/admin/databases/index.blade.php
View file

@ -52,20 +52,21 @@
</tr>
</thead>
<tbody>
@foreach($databases as $db)
@foreach($databases as $database)
<tr>
<td>{{ $db->a_serverName }}</td>
<td>{{ $db->database }}</td>
<td>{{ $db->username }} ({{ $db->remote }})</td>
<td><code>{{ $db->a_host }}:{{ $db->a_port }}</code></td>
<td class="text-center"><a href="/admin/servers/view/{{ $db->a_serverId }}?tab=tab_database"><i class="fa fa-search"></i></a></td>
<td class="text-center"><a href="#" data-action="delete" data-type="delete" data-attr="{{ $db->id }}" class="text-danger"><i class="fa fa-trash-o"></i></a></td>
<td>{{ $database->server->name }}</td>
<td>{{ $database->database }}</td>
<td>{{ $database->username }} ({{ $database->remote }})</td>
<?php $host = $hosts->where('id', $database->db_server)->first(); ?>
<td><code>{{ $host->host }}:{{ $host->port }}</code></td>
<td class="text-center"><a href="/admin/servers/view/{{ $database->server->id }}?tab=tab_database"><i class="fa fa-search"></i></a></td>
<td class="text-center"><a href="#" data-action="delete" data-type="delete" data-attr="{{ $database->id }}" class="text-danger"><i class="fa fa-trash-o"></i></a></td>
</tr>
@endforeach
</tbody>
</table>
<div class="col-md-12 text-center">
{{ $databases->appends('tab', 'tab_databases')->render() }}
{{ $databases->appends(['tab' => 'tab_databases'])->links() }}
</div>
</div>
</div>
@ -86,20 +87,20 @@
</tr>
</thead>
<tbody>
@foreach($dbh as $db)
@foreach($hosts as $database)
<tr>
<td>{{ $db->name }}</td>
<td><code>{{ $db->host }}:{{ $db->port }}</code></td>
<td>{{ $db->username }}</td>
<td class="text-center">{{ $db->c_databases }}</td>
<td>@if(is_null($db->a_linkedNode))<em>unlinked</em>@else{{ $db->a_linkedNode }}@endif</td>
<td class="text-center"><a href="#" class="text-danger" data-action="delete" data-type="delete-server" data-attr="{{ $db->id }}"><i class="fa fa-trash-o"></i></a></td>
<td>{{ $database->name }}</td>
<td><code>{{ $database->host }}:{{ $database->port }}</code></td>
<td>{{ $database->username }}</td>
<td class="text-center">{{ $database->c_databases }}</td>
<td>@if(is_null($database->node))<em>unlinked</em>@else{{ $database->node->name }}@endif</td>
<td class="text-center"><a href="#" class="text-danger" data-action="delete" data-type="delete-server" data-attr="{{ $database->id }}"><i class="fa fa-trash-o"></i></a></td>
</tr>
@endforeach
</tbody>
</table>
<div class="col-md-12 text-center">
{{ $dbh->appends('tab', 'tab_dbservers')->render() }}
{{ $hosts->appends('tab', 'tab_dbservers')->render() }}
</div>
</div>
</div>

2
resources/views/admin/databases/new.blade.php
View file

@ -47,7 +47,7 @@
<select name="linked_node" class="form-control">
<option>None</option>
@foreach($nodes as $node)
<option value="{{ $node->id }}" @if((int) old('linked_node') === $node->id) selected="selected" @endif>{{ $node->name }} ({{ $node->a_location }})</option>
<option value="{{ $node->id }}" @if((int) old('linked_node') === $node->id) selected="selected" @endif>{{ $node->name }} ({{ $node->location->short }})</option>
@endforeach
</select>
<p class="text-muted"><small>A linked node implies that this Database Server is running on that node and it will be auto-selected when adding a database to servers on that node.</small></p>