borrar tareas en el icono de la cabecera

Comandos deploy imagen y particionado mejorados
creada vista para netboot

5 files changed, 10 insertions, 10 deletions

diff --git a/admin/WebConsole3/frontend/src/app/api/netboot.service.ts b/admin/WebConsole3/frontend/src/app/api/netboot.service.ts
index ab469ae1..ab89ca58 100644
--- a/admin/WebConsole3/frontend/src/app/api/netboot.service.ts
+++ b/admin/WebConsole3/frontend/src/app/api/netboot.service.ts
@@ -19,6 +19,6 @@ export class NetbootService extends ResourceService<Netboot> {
     }
 
     updateFiles(assignedNetboots: {}): Observable<any> {
-        return this.httpClient.post(this.url + '/clients', JSON.stringify(assignedNetboots));
+        return this.httpClient.post(this.url + '/netboots/clients', JSON.stringify(assignedNetboots));
     }
 }
diff --git a/admin/WebConsole3/frontend/src/app/core/header-inner/header-inner.component.ts b/admin/WebConsole3/frontend/src/app/core/header-inner/header-inner.component.ts
index 8aaef052..f80b10bf 100644
--- a/admin/WebConsole3/frontend/src/app/core/header-inner/header-inner.component.ts
+++ b/admin/WebConsole3/frontend/src/app/core/header-inner/header-inner.component.ts
@@ -56,9 +56,9 @@ export class HeaderInnerComponent implements  OnInit {
             this.translate.instant('sure_to_delete_task') + '?',
             function(result) {
                 if (result) {
-                    this.traceService.delete(trace.id).then(
+                    self.traceService.delete(trace.id).subscribe(
                         function(response) {
-                            self.toaster.pop({type: 'success', title: 'success', body: this.translate.instant('successfully_deleted')});
+                            self.toaster.pop({type: 'success', title: 'success', body: self.translate.instant('successfully_deleted')});
                             self.getExectutionTasks();
                         },
                         function(error) {
diff --git a/admin/WebConsole3/frontend/src/app/pages/command/deploy-image-command/deploy-image-command.component.html b/admin/WebConsole3/frontend/src/app/pages/command/deploy-image-command/deploy-image-command.component.html
index 7dc55c29..babd54af 100644
--- a/admin/WebConsole3/frontend/src/app/pages/command/deploy-image-command/deploy-image-command.component.html
+++ b/admin/WebConsole3/frontend/src/app/pages/command/deploy-image-command/deploy-image-command.component.html
@@ -46,13 +46,13 @@
               </select>
             </div>
           </div>
-          <div class="form-group col-md-2">
+          <div class="form-group col-md-2" *ngIf="deployImage === 'true'">
             <label for="disk" translate="disk">
             </label>
             <input name="disk" type="number" min="1" [(ngModel)]="disk" class="form-control">
 
           </div>
-          <div class="form-group col-md-2">
+          <div class="form-group col-md-2" *ngIf="deployImage === 'true'">
             <label for="partition" translate="partition">
             </label>
             <input name="partition" type="number" min="1" [(ngModel)]="partition" class="form-control">
diff --git a/admin/WebConsole3/frontend/src/app/pages/command/deploy-image-command/deploy-image-command.component.ts b/admin/WebConsole3/frontend/src/app/pages/command/deploy-image-command/deploy-image-command.component.ts
index b8312964..479781d6 100644
--- a/admin/WebConsole3/frontend/src/app/pages/command/deploy-image-command/deploy-image-command.component.ts
+++ b/admin/WebConsole3/frontend/src/app/pages/command/deploy-image-command/deploy-image-command.component.ts
@@ -34,7 +34,7 @@ export class DeployImageCommandComponent implements OnInit {
   images = [];
   deployMethods = [];
   deployMethod = 'MULTICAST';
-  private deployImage: string;
+  public deployImage: string;
   private user: User;
   private constants: any;
   public image: any;
@@ -75,7 +75,7 @@ export class DeployImageCommandComponent implements OnInit {
       } else {
         // TODO - dar error?
         this.toaster.pop({type: 'error', body: this.translate.instant('not_clients_selected'), title: this.translate.instant('opengnsys_error')});
-        this.router.navigate(['app.ous']);
+        this.router.navigate(['/app/ous']);
       }
     }
   }
diff --git a/admin/WebConsole3/frontend/src/app/pages/command/partition-format-command/partition-format-command.component.ts b/admin/WebConsole3/frontend/src/app/pages/command/partition-format-command/partition-format-command.component.ts
index 6f291452..3fa11388 100644
--- a/admin/WebConsole3/frontend/src/app/pages/command/partition-format-command/partition-format-command.component.ts
+++ b/admin/WebConsole3/frontend/src/app/pages/command/partition-format-command/partition-format-command.component.ts
@@ -52,7 +52,7 @@ export class PartitionFormatCommandComponent implements OnInit {
                 data => {
                     this.constants = data.constants;
                     // Comprobar la selección de clientes
-                    if (this.ogCommonService.selectedClients) {
+                    if (this.ogCommonService.getSelectionSize() > 0) {
 
                         // Recorrer todos los clientes seleccionados y usar el tamaño del disco de menor tamaño
                         const clientsId = Object.keys(this.ogCommonService.selectedClients);
@@ -110,8 +110,8 @@ export class PartitionFormatCommandComponent implements OnInit {
                         this.partitionTableTypes = this.constants.partitiontable;
                     } else {
                         // TODO - dar error?
-                        this.ogSweetAlert.error(this.translate.instant('opengnsys_error'), this.translate.instant('not_clients_selected'));
-                        this.router.navigate(['app/ous']);
+                        this.toaster.pop({type: 'error', body: this.translate.instant('not_clients_selected'), title: this.translate.instant('opengnsys_error')});
+                        this.router.navigate(['/app/ous']);
                     }
 
                 }