← Back to branch summary

~ltrager/maas/lp1654432_2.1

« back to all changes in this revision

Viewing changes to src/maasserver/static/js/angular/directives/boot_images.js

  • Committer: LaMont Jones
  • Date: 2016-10-12 15:26:17 UTC
  • mfrom: (5469 maas)
  • mto: This revision was merged to the branch mainline in revision 5482.
  • Revision ID: lamont@canonical.com-20161012152617-t14n2jt7y5b7hidb
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/static/js/angular/directives/boot_images.js
378
378
                                        title: release.title,
379
379
                                        arch: arch.title,
380
380
                                        size: '-',
381
 
                                        status: 'Queued for download',
 
381
                                        status: 'Selected for download',
382
382
                                        beingDeleted: false
383
383
                                    };
384
384
                                    var resource = getResource(
406
406
                                title: resource.title,
407
407
                                arch: resource.arch,
408
408
                                size: resource.size,
409
 
                                status: 'Queued for deletion',
 
409
                                status: 'Will be deleted',
410
410
                                beingDeleted: true
411
411
                            };
412
412
                            $scope.ubuntuImages.push(image);
454
454
                                    title: otherImage.title,
455
455
                                    arch: name_split[1],
456
456
                                    size: '-',
457
 
                                    status: 'Queued for download',
 
457
                                    status: 'Selected for download',
458
458
                                    beingDeleted: false
459
459
                                };
460
460
                                var resource = getResource(
480
480
                            title: resource.title,
481
481
                            arch: resource.arch,
482
482
                            size: resource.size,
483
 
                            status: 'Queued for deletion',
 
483
                            status: 'Will be deleted',
484
484
                            beingDeleted: true
485
485
                        };
486
486
                        $scope.otherImages.push(image);