#14 change authenticationType valid in update connection component

metatron-app · Aug 22, 2018 · 1469c0b · 1469c0b
1 parent 3c3adda
commit 1469c0b
Show file tree

Hide file tree

Showing 3 changed files with 238 additions and 335 deletions.
diff --git a/...-connection/handler-data-connection/create-data-connection/create-connection.component.ts b/...-connection/handler-data-connection/create-data-connection/create-connection.component.ts
@@ -246,7 +246,7 @@ export class CreateConnectionComponent extends AbstractPopupComponent implements
   }
 
   /**
-   * Is enable connection
+   * Is enable connection check
    * @returns {boolean}
    */
   public isEnabledConnectionValidation() : boolean {
@@ -451,7 +451,7 @@ export class CreateConnectionComponent extends AbstractPopupComponent implements
       authenticationType: this.selectedSecurityType.value
     };
     // if security type is not USERINFO, add password and username
-    if (this.selectedSecurityType.value !== 'USERINFO') {
+    if (this.isConnectUserAccount()) {
       params['password'] = this.password.trim();
       params['username'] = this.username.trim();
     }

diff --git a/...onnection/handler-data-connection/update-data-connection/update-connection.component.html b/...onnection/handler-data-connection/update-data-connection/update-connection.component.html
@@ -90,7 +90,7 @@
               <!-- check -->
               <div class="ddp-check">
                 <label class="ddp-label-checkbox" (click)="onChangeEnableURL()">
-                  <input type="checkbox" [checked]="isEnableUrl">
+                  <input type="checkbox" [checked]="isEnableUrl" tabindex="-1">
                   <i class="ddp-icon-checkbox"></i>
                   <span class="ddp-txt-checkbox">{{'msg.storage.ui.conn.url.only' | translate}}</span>
                 </label>
@@ -114,7 +114,7 @@
               <!-- check -->
               <div class="ddp-check">
                 <label class="ddp-label-checkbox" (click)="onChangeEnableURL()">
-                  <input type="checkbox" [checked]="isEnableUrl">
+                  <input type="checkbox" [checked]="isEnableUrl" tabindex="-1">
                   <i class="ddp-icon-checkbox"></i>
                   <span class="ddp-txt-checkbox">{{'msg.storage.ui.conn.url.only' | translate}}</span>
                 </label>
@@ -229,15 +229,15 @@
         <!-- edit option -->
         <div class="ddp-ui-edit-option ddp-type">
           <div class="ddp-data-result">
-            <ng-container *ngIf="connection.published">
+            <ng-container *ngIf="published">
               {{'msg.storage.ui.conn.create.all.workspace' | translate}}
             </ng-container>
-            <ng-container *ngIf="!connection.published">
+            <ng-container *ngIf="!published">
               <strong>{{linkedWorkspaces}}</strong> {{'msg.storage.ui.conn.create.workspace' | translate}}  <a href="javascript:" class="ddp-link-edit2" (click)="onClickSetWorkspace()">{{'msg.storage.btn.edit' | translate}}</a>
             </ng-container>
           </div>
           <label class="ddp-label-checkbox" (click)="onClickPublishConnection()">
-            <input type="checkbox" [checked]="connection.published">
+            <input type="checkbox" [checked]="published">
             <i class="ddp-icon-checkbox"></i>
             <span class="ddp-txt-checkbox">{{'msg.storage.ui.permission.choice.dconn' | translate}}</span>
           </label>