merge

genouest · Jul 19, 2024 · 4cf3d91 · 4cf3d91
2 parents 3894345 + 970e6b8
commit 4cf3d91
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 53 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@
 * Updated TP calendar to increase readability
 * Fix newly created group selection bug
 * Actually show angular errors in web console when not in production and sentry is not set
+* Fix owner change for databases and websites
 
 ## 1.4.29
 

diff --git a/manager2/src/app/project/project.component.html b/manager2/src/app/project/project.component.html
@@ -59,7 +59,7 @@ <h3>Request a new project creation</h3>
             </div>
           </div>
 
-          <div class="form-group" *ngIf="config.project.terms_and_conditions_hds">
+          <div class="form-group" *ngIf="config.project && config.project.terms_and_conditions_hds">
             <div class="form-check">
               <input class="form-check-input is-invalid" type="checkbox" value="" id="new_project_terms_and_conditions_hds" name="terms_and_conditions_hds" [(ngModel)]="new_project.terms_and_conditions_hds" #terms_and_conditions_hds="ngModel" required>
               <label class="form-check-label" for="new_project_terms_and_conditions_hds">
@@ -77,7 +77,7 @@ <h3>Request a new project creation</h3>
         <div class="modal-footer" id="submit">
           <div class="form-group row col-sm-12">
           <!-- Button with terms_and_conditions_hds -->
-          <button *ngIf="config.project.terms_and_conditions_hds" 
+          <button *ngIf="config.project && config.project.terms_and_conditions_hds" 
                   id="test" 
                   type="submit" 
                   class="p-button p-button-sm p-button-primary" 
@@ -87,7 +87,7 @@ <h3>Request a new project creation</h3>
           </button>
 
           <!-- Button without terms_and_conditions_hds -->
-          <button *ngIf="!config.project.terms_and_conditions_hds" 
+          <button *ngIf="!(config.project && config.project.terms_and_conditions_hds)" 
                   id="test" 
                   type="submit" 
                   class="p-button p-button-sm p-button-primary" 
@@ -348,4 +348,4 @@ <h4 class="modal-title">Terms and Conditions HDS</h4>
         </div>
       </div>
     </div>
-</div>
+</div>
diff --git a/manager2/src/app/user/user.component.html b/manager2/src/app/user/user.component.html
@@ -395,55 +395,6 @@ <h4>Projects</h4>
             <app-user-projects [projects]="new_projects" [user_projects]="user_projects" [user]="user"></app-user-projects>
           </div>
         </div>
-
-        <div *ngIf="config.enable_ui && config.enable_ui.databases" class="card bg-light">
-          <div class="card-header">
-            <h4>Databases</h4>
-          </div>
-          <div class="card-body">
-            <div *ngIf="dbmsg" class="alert alert-info alert-dismissible" role="alert">
-              {{dbmsg}}
-              <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-              </button>
-            </div>
-            <div *ngIf="dbmsg_error" class="alert alert-danger alert-dismissible" role="alert">
-              {{dbmsg_error}}
-              <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-              </button>
-            </div>
-            <div *ngIf="rm_dbmsg" class="alert alert-warning alert-dismissible" role="alert">
-              {{rm_dbmsg}}
-              <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-              </button>
-            </div>
-            <div class="form-group row">
-              <div class="col-sm-6">
-                <label for="database">Database name</label>
-                <input placeholder="no space or accent" type="text" [ngModelOptions]="{standalone: true}" [(ngModel)]="database.name" id='database'class="form-control"/>
-              </div>
-            </div>
-            <div class="form-group">
-              <button type="button" class="p-button p-button-sm p-button-primary" (click)="db_add()">Create</button>
-            </div>
-
-            <div class="table-responsive">
-              <table aria-label="databases" *ngIf="databases && databases.length > 0" class="table table-striped">
-                <thead>
-                  <th scope="col">Name</th><th scope="col"></th>
-                </thead>
-                <tbody>
-                  <tr *ngFor="let db of databases">
-                    <td>{{db.name}}</td>
-                    <td><app-my-delete-confirm [onConfirm]="db_delete" [data]="db.name"></app-my-delete-confirm>
-                  </tr>
-                </tbody>
-              </table>
-            </div>
-          </div>
-        </div>
       </div>
 
       <div class="col-md-6 col-sm-12" *ngIf="panel == 1">