fix: Remove duplicate set value for account

rucken · Nov 13, 2017 · aa1067f · aa1067f
1 parent b74de7b
commit aa1067f
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 37 deletions.
diff --git a/...grids/content-types-grid/content-type-select-input/content-type-select-input.component.ts b/...grids/content-types-grid/content-type-select-input/content-type-select-input.component.ts
@@ -56,7 +56,6 @@ export class ContentTypeSelectInputComponent extends BaseResourceSelectInputComp
       this.app.modals(this.resolver).create(ContentTypesListModalComponent);
     itemModal.name = 'selectContentTypes';
     itemModal.hardReadonly = this.hardReadonly;
-    itemModal.account = this.account;
     itemModal.okTitle = translate('Select');
     itemModal.title = translate('Content types');
     itemModal.onOk.subscribe(($event: any) => {
@@ -72,9 +71,6 @@ export class ContentTypeSelectInputComponent extends BaseResourceSelectInputComp
     itemModal.onClose.subscribe(() => this.focus());
     itemModal.item = this.value;
     itemModal.modal.show();
-    this.cachedResourcesService.changeStatusItem$.takeUntil(this.destroyed$).subscribe(status =>
-      itemModal.okInProcessFromStatus(status)
-    );
   }
   get statusListMessage() {
     return '';

diff --git a/libs/web/src/grids/content-types-grid/content-types-grid.component.ts b/libs/web/src/grids/content-types-grid/content-types-grid.component.ts
@@ -48,7 +48,6 @@ export class ContentTypesGridComponent extends BaseResourcesGridComponent {
     this.modalIsOpened = true;
     const itemModal: ContentTypeModalComponent = this.app.modals(this.resolver).create(ContentTypeModalComponent);
     itemModal.name = 'createContentType';
-    itemModal.account = this.accountService.account;
     itemModal.readonly = !this.accessToAdd;
     itemModal.okTitle = translate('Create');
     itemModal.title = translate('Create new content type');
@@ -68,7 +67,6 @@ export class ContentTypesGridComponent extends BaseResourcesGridComponent {
     this.modalIsOpened = true;
     const itemModal: ContentTypeModalComponent = this.app.modals(this.resolver).create(ContentTypeModalComponent);
     itemModal.name = 'editContentType';
-    itemModal.account = this.accountService.account;
     itemModal.readonly = !this.accessToChange;
     itemModal.okTitle = translate('Save');
     itemModal.title = translate('Edit content type');

diff --git a/libs/web/src/grids/fontawesomes-grid/fontawesome-input/fontawesome-input.component.ts b/libs/web/src/grids/fontawesomes-grid/fontawesome-input/fontawesome-input.component.ts
@@ -55,7 +55,6 @@ export class FontawesomeInputComponent extends BaseResourceInputComponent {
       this.app.modals(this.resolver).create(FontawesomesListModalComponent);
     itemModal.name = 'selectFontawesomes';
     itemModal.hardReadonly = this.hardReadonly;
-    itemModal.account = this.account;
     itemModal.okTitle = translate('Select');
     itemModal.title = translate('Fontawesomes');
     itemModal.onOk.subscribe(($event: any) => {
@@ -68,8 +67,5 @@ export class FontawesomeInputComponent extends BaseResourceInputComponent {
     itemModal.onClose.subscribe(() => this.focus());
     itemModal.item = this.value;
     itemModal.modal.show();
-    this.cachedResourcesService.changeStatusItem$.takeUntil(this.destroyed$).subscribe(status =>
-      itemModal.okInProcessFromStatus(status)
-    );
   }
 }
diff --git a/libs/web/src/grids/fontawesomes-grid/fontawesomes-grid.component.ts b/libs/web/src/grids/fontawesomes-grid/fontawesomes-grid.component.ts
@@ -48,7 +48,6 @@ export class FontawesomesGridComponent extends BaseResourcesGridComponent {
     this.modalIsOpened = true;
     const itemModal: FontawesomeModalComponent = this.app.modals(this.resolver).create(FontawesomeModalComponent);
     itemModal.name = 'createFontawesome';
-    itemModal.account = this.accountService.account;
     itemModal.readonly = !this.accessToAdd;
     itemModal.okTitle = translate('Create');
     itemModal.title = translate('Create new fontawesome');
@@ -68,7 +67,6 @@ export class FontawesomesGridComponent extends BaseResourcesGridComponent {
     this.modalIsOpened = true;
     const itemModal: FontawesomeModalComponent = this.app.modals(this.resolver).create(FontawesomeModalComponent);
     itemModal.name = 'editFontawesome';
-    itemModal.account = this.accountService.account;
     itemModal.readonly = !this.accessToChange;
     itemModal.okTitle = translate('Save');
     itemModal.title = translate('Edit fontawesome');

diff --git a/libs/web/src/grids/group-permissions-grid/group-permissions-grid.component.ts b/libs/web/src/grids/group-permissions-grid/group-permissions-grid.component.ts
@@ -78,7 +78,6 @@ export class GroupPermissionsGridComponent extends BaseResourcesGridComponent {
     itemModal.name = 'createGroupPermission';
     itemModal.hardReadonly = this.hardReadonly;
     itemModal.permissions.maxSelectCount = 10000;
-    itemModal.account = this.accountService.account;
     itemModal.readonly = this.readonly;
     itemModal.okTitle = translate('Append');
     itemModal.title = translate('Select permissions for append to group');
@@ -101,7 +100,6 @@ export class GroupPermissionsGridComponent extends BaseResourcesGridComponent {
     this.modalIsOpened = true;
     const itemModal: PermissionModalComponent = this.app.modals(this.resolver).create(PermissionModalComponent);
     itemModal.name = 'editGroupPermission';
-    itemModal.account = this.accountService.account;
     itemModal.readonly = !this.accessToChange || this.readonly;
     itemModal.okTitle = translate('Save');
     itemModal.title = translate('Edit permission');

diff --git a/libs/web/src/grids/groups-grid/group-select-input/group-select-input.component.ts b/libs/web/src/grids/groups-grid/group-select-input/group-select-input.component.ts
@@ -50,7 +50,6 @@ export class GroupSelectInputComponent extends BaseResourceSelectInputComponent
       this.app.modals(this.resolver).create(GroupsListModalComponent);
     itemModal.name = 'selectGroups';
     itemModal.hardReadonly = this.hardReadonly;
-    itemModal.account = this.account;
     itemModal.okTitle = translate('Select');
     itemModal.title = translate('Groups');
     itemModal.onOk.subscribe(($event: any) => {
@@ -66,8 +65,5 @@ export class GroupSelectInputComponent extends BaseResourceSelectInputComponent
     itemModal.onClose.subscribe(() => this.focus());
     itemModal.item = this.value;
     itemModal.modal.show();
-    this.cachedResourcesService.changeStatusItem$.takeUntil(this.destroyed$).subscribe(status =>
-      itemModal.okInProcessFromStatus(status)
-    );
   }
 }
diff --git a/libs/web/src/grids/groups-grid/groups-grid.component.ts b/libs/web/src/grids/groups-grid/groups-grid.component.ts
@@ -51,7 +51,6 @@ export class GroupsGridComponent extends BaseResourcesGridComponent {
     this.modalIsOpened = true;
     const itemModal: GroupModalComponent = this.app.modals(this.resolver).create(GroupModalComponent);
     itemModal.name = 'createGroup';
-    itemModal.account = this.accountService.account;
     itemModal.readonly = this.hardReadonly || !this.accessToAdd;
     itemModal.okTitle = translate('Create');
     itemModal.title = translate('Create new group');
@@ -71,7 +70,6 @@ export class GroupsGridComponent extends BaseResourcesGridComponent {
     this.modalIsOpened = true;
     const itemModal: GroupModalComponent = this.app.modals(this.resolver).create(GroupModalComponent);
     itemModal.name = 'editGroup';
-    itemModal.account = this.accountService.account;
     itemModal.readonly = this.hardReadonly || !this.accessToChange;
     itemModal.okTitle = translate('Save');
     itemModal.title = translate('Edit group');

diff --git a/libs/web/src/grids/permissions-grid/permission-input/permission-input.component.ts b/libs/web/src/grids/permissions-grid/permission-input/permission-input.component.ts
@@ -55,7 +55,6 @@ export class PermissionInputComponent extends BaseResourceInputComponent {
       this.app.modals(this.resolver).create(PermissionsListModalComponent);
     itemModal.name = 'selectPermissions';
     itemModal.hardReadonly = this.hardReadonly;
-    itemModal.account = this.account;
     itemModal.okTitle = translate('Select');
     itemModal.title = translate('Permissions');
     itemModal.onOk.subscribe(($event: any) => {
@@ -68,8 +67,5 @@ export class PermissionInputComponent extends BaseResourceInputComponent {
     itemModal.onClose.subscribe(() => this.focus());
     itemModal.item = this.value;
     itemModal.modal.show();
-    this.cachedResourcesService.changeStatusItem$.takeUntil(this.destroyed$).subscribe(status =>
-      itemModal.okInProcessFromStatus(status)
-    );
   }
 }
diff --git a/libs/web/src/grids/permissions-grid/permissions-grid.component.ts b/libs/web/src/grids/permissions-grid/permissions-grid.component.ts
@@ -48,7 +48,6 @@ export class PermissionsGridComponent extends BaseResourcesGridComponent {
     this.modalIsOpened = true;
     const itemModal: PermissionModalComponent = this.app.modals(this.resolver).create(PermissionModalComponent);
     itemModal.name = 'createPermission';
-    itemModal.account = this.accountService.account;
     itemModal.readonly = this.hardReadonly || !this.accessToAdd;
     itemModal.okTitle = translate('Create');
     itemModal.title = translate('Create new permission');
@@ -68,7 +67,6 @@ export class PermissionsGridComponent extends BaseResourcesGridComponent {
     this.modalIsOpened = true;
     const itemModal: PermissionModalComponent = this.app.modals(this.resolver).create(PermissionModalComponent);
     itemModal.name = 'editPermission';
-    itemModal.account = this.accountService.account;
     itemModal.readonly = this.hardReadonly || !this.accessToChange;
     itemModal.okTitle = translate('Save');
     itemModal.title = translate('Edit permission');

diff --git a/libs/web/src/grids/user-groups-grid/user-groups-grid.component.ts b/libs/web/src/grids/user-groups-grid/user-groups-grid.component.ts
@@ -75,7 +75,6 @@ export class UserGroupsGridComponent extends BaseResourcesGridComponent {
     itemModal.name = 'selectGroups';
     itemModal.hardReadonly = this.hardReadonly;
     itemModal.groups.maxSelectCount = 10000;
-    itemModal.account = this.accountService.account;
     itemModal.readonly = this.readonly;
     itemModal.okTitle = translate('Append');
     itemModal.title = translate('Select groups for append to user');
@@ -87,6 +86,9 @@ export class UserGroupsGridComponent extends BaseResourcesGridComponent {
       id: itemModal.item.pk,
       group: itemModal.item
     })];
+    this.cachedResourcesService.changeStatusItem$.takeUntil(this.destroyed$).subscribe(status =>
+      itemModal.okInProcessFromStatus(status)
+    );
   }
   showEditModal(item: any | UserGroup) {
     if (this.modalIsOpened) {
@@ -95,7 +97,6 @@ export class UserGroupsGridComponent extends BaseResourcesGridComponent {
     this.modalIsOpened = true;
     const itemModal: GroupModalComponent = this.app.modals(this.resolver).create(GroupModalComponent);
     itemModal.name = 'editUserGroup';
-    itemModal.account = this.accountService.account;
     itemModal.readonly = this.hardReadonly || !this.accessToChange || this.readonly;
     itemModal.okTitle = translate('Save');
     itemModal.title = translate('Edit group');
@@ -140,6 +141,9 @@ export class UserGroupsGridComponent extends BaseResourcesGridComponent {
     confirm.onClose.subscribe(() => this.focus());
     this.selectedItems = [item];
     confirm.modal.show();
+    this.cachedResourcesService.changeStatusItem$.takeUntil(this.destroyed$).subscribe(status =>
+      confirm.okInProcessFromStatus(status)
+    );
   }
   save(itemModal: GroupsListModalComponent) {
     const items: Group[] = itemModal.items;

diff --git a/libs/web/src/grids/users-grid/user-select-input/user-select-input.component.ts b/libs/web/src/grids/users-grid/user-select-input/user-select-input.component.ts
@@ -51,7 +51,6 @@ export class UserSelectInputComponent extends BaseResourceSelectInputComponent {
       this.app.modals(this.resolver).create(UsersListModalComponent);
     itemModal.name = 'selectUsers';
     itemModal.hardReadonly = this.hardReadonly;
-    itemModal.account = this.account;
     itemModal.okTitle = translate('Select');
     itemModal.title = translate('Users');
     itemModal.onOk.subscribe(($event: any) => {
@@ -67,8 +66,5 @@ export class UserSelectInputComponent extends BaseResourceSelectInputComponent {
     itemModal.onClose.subscribe(() => this.focus());
     itemModal.item = this.value;
     itemModal.modal.show();
-    this.cachedResourcesService.changeStatusItem$.takeUntil(this.destroyed$).subscribe(status =>
-      itemModal.okInProcessFromStatus(status)
-    );
   }
 }
diff --git a/libs/web/src/grids/users-grid/users-grid.component.ts b/libs/web/src/grids/users-grid/users-grid.component.ts
@@ -48,7 +48,6 @@ export class UsersGridComponent extends BaseResourcesGridComponent {
     this.modalIsOpened = true;
     const itemModal: UserModalComponent = this.app.modals(this.resolver).create(UserModalComponent);
     itemModal.name = 'createUser';
-    itemModal.account = this.accountService.account;
     itemModal.readonly = this.hardReadonly || !this.accessToAdd;
     itemModal.okTitle = translate('Create');
     itemModal.title = translate('Create new user');
@@ -68,7 +67,6 @@ export class UsersGridComponent extends BaseResourcesGridComponent {
     this.modalIsOpened = true;
     const itemModal: UserModalComponent = this.app.modals(this.resolver).create(UserModalComponent);
     itemModal.name = 'editUser';
-    itemModal.account = this.accountService.account;
     itemModal.readonly = this.hardReadonly || !this.accessToChange;
     itemModal.okTitle = translate('Save');
     itemModal.title = translate('Edit user');

diff --git a/libs/web/src/modals/auth-modal/auth-modal.component.html b/libs/web/src/modals/auth-modal/auth-modal.component.html
@@ -10,9 +10,9 @@ <h4 class="modal-title">{{title | translate}}</h4>
       </div>
       <form (ngSubmit)="ok()">
         <div class="modal-body">
-          <text-input [errors]="errors" [info]="info" name="username" [(model)]="account.username" [title]="modelMeta.titles.usernameOrEmail"
+          <text-input [errors]="errors" [info]="info" name="username" [(model)]="user.username" [title]="modelMeta.titles.usernameOrEmail"
             [focused]="true" #focusElement></text-input>
-          <text-input [errors]="errors" [info]="info" type="password" name="password" [(model)]="account.password" [title]="modelMeta.titles.password"></text-input>
+          <text-input [errors]="errors" [info]="info" type="password" name="password" [(model)]="user.password" [title]="modelMeta.titles.password"></text-input>
         </div>
         <div class="modal-footer">
           <footer-buttons (onClose)="close()" (onOk)="ok()" [okTitle]="okTitle"

diff --git a/libs/web/src/modals/auth-modal/auth-modal.component.ts b/libs/web/src/modals/auth-modal/auth-modal.component.ts
@@ -31,9 +31,10 @@ export class AuthModalComponent extends BaseModalComponent {
   onOk: EventEmitter<AuthModalComponent | any> = new EventEmitter<any>();
 
   modelMeta: any = User.meta();
+  user: User | any;
 
   init() {
     super.init();
-    this.account = new User();
+    this.user = new User();
   }
 }