Fix in project approvals, dev-db fix

This commit is contained in:
KennyTV 2020-10-01 10:45:07 +02:00
parent e25c71f33a
commit b8f6c0683e
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
3 changed files with 20 additions and 18 deletions

View File

@ -7,9 +7,8 @@ function create_user_and_database() {
local database=$1
echo " Creating user and database '$database'"
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" <<-EOSQL
CREATE USER $database WITH PASSWORD '$database';
CREATE DATABASE $database;
GRANT ALL PRIVILEGES ON DATABASE $database TO $database;
GRANT ALL PRIVILEGES ON DATABASE $database TO $POSTGRES_USER;
EOSQL
}

View File

@ -6,8 +6,8 @@ services:
environment:
POSTGRES_MULTIPLE_DATABASES: hangarauth
POSTGRES_DB: hangar
POSTGRES_USER: root
POSTGRES_PASSWORD: 'changeme'
POSTGRES_USER: hangar
POSTGRES_PASSWORD: 'hangar'
ports:
- "5432:5432"
volumes:

View File

@ -59,25 +59,26 @@
<@renderApprovalList needsApproval />
</div>
</div>
<div class="row">
<div class="col-md-12 header-flags">
<h2>Awaiting Changes</h2>
</div>
</div>
<div class="row">
<div class="col-md-12 header-flags">
<h2>Awaiting Changes</h2>
</div>
<div class="row">
<div class="col-md-12">
<div class="card">
<div class="card-header">
<h4 class="card-title float-left">Awaiting Changes</h4>
<div class="clearfix"></div>
</div>
<@renderApprovalList waitingProjects />
</div>
<div class="row">
<div class="col-md-12">
<div class="card">
<div class="card-header">
<h4 class="card-title float-left">Awaiting Changes</h4>
<div class="clearfix"></div>
</div>
<@renderApprovalList waitingProjects />
</div>
</div>
</div>
<div class="modal fade" id="modal-visibility-comment" tabindex="-1" role="dialog" aria-labelledby="modal-visibility-comment">
<div class="modal fade" id="modal-visibility-comment" tabindex="-1" role="dialog"
aria-labelledby="modal-visibility-comment">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
@ -91,7 +92,9 @@
</div>
<div class="modal-footer">
<button class="btn btn-default">Close</button>
<button class="btn btn-visibility-comment-submit btn-primary"><i class="fas fa-pencil-alt"></i> Submit</button>
<button class="btn btn-visibility-comment-submit btn-primary"><i class="fas fa-pencil-alt"></i>
Submit
</button>
</div>
</div>
</div>