← Back to branch summary

~andreserl/maas/refactor_debconf_selections_preseed

« back to all changes in this revision

Viewing changes to src/maasserver/static/js/angular/controllers/node_details.js

  • Committer: MAAS Lander
  • Author(s): Lee Trager
  • Date: 2017-03-01 22:46:02 UTC
  • mfrom: (5755.3.5 test_result_ui)
  • Revision ID: maas_lander-20170301224602-pd2kbtwexkqd5r2b
[r=andreserl][bug=][author=ltrager] Add a section to the UI for test results.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/static/js/angular/controllers/node_details.js
1
 
/* Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
 
1
/* Copyright 2015-2017 Canonical Ltd.  This software is licensed under the
2
2
 * GNU Affero General Public License version 3 (see the file LICENSE).
3
3
 *
4
4
 * MAAS Node Details Controller
244
244
            // If the viewName is empty, then a default one was not selected.
245
245
            // We want the installation output to be the default if possible.
246
246
            if(!angular.isString(viewName)) {
247
 
                viewName = "install";
 
247
                viewName = "installation";
248
248
            }
249
249
 
250
250
            // Setup the views that are viewable.
259
259
            if(angular.isArray($scope.node.commissioning_results) &&
260
260
                $scope.node.commissioning_results.length > 0) {
261
261
                $scope.machine_output.views.push({
262
 
                    name: "output",
263
 
                    title: "Commissioning Output"
 
262
                    name: "commissioning",
 
263
                    title: "Commissioning Results"
264
264
                });
265
265
            }
266
266
            if(angular.isArray($scope.node.installation_results) &&
267
267
                $scope.node.installation_results.length > 0) {
268
268
                $scope.machine_output.views.push({
269
 
                    name: "install",
 
269
                    name: "installation",
270
270
                    title: "Installation Output"
271
271
                });
272
272
            }
956
956
            } else {
957
957
                // Prepend a newline before the data, because the code
958
958
                // tag requires that the content start on a newline.
959
 
                return "\n" + results[0].data;
 
959
                return "\n" + results[0].output;
960
960
            }
961
961
        };
962
962