mitchell852 closed pull request #2493: testing passing contents of a file from
the server to TP and promptin…
URL: https://github.com/apache/trafficcontrol/pull/2493
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/traffic_ops/app/foo.txt b/traffic_ops/app/foo.txt
new file mode 100644
index 000000000..b6fc4c620
--- /dev/null
+++ b/traffic_ops/app/foo.txt
@@ -0,0 +1 @@
+hello
\ No newline at end of file
diff --git a/traffic_ops/app/lib/API/Iso.pm b/traffic_ops/app/lib/API/Iso.pm
index c42cef7dd..390c4fcaf 100644
--- a/traffic_ops/app/lib/API/Iso.pm
+++ b/traffic_ops/app/lib/API/Iso.pm
@@ -80,8 +80,27 @@ sub generate {
return $self->alert($result);
}
- my $response = $self->generate_iso($params);
- return $self->success( $response, "Generate ISO was successful." );
+ # path relative to /opt/traffic_ops/app
+ my $filename = 'foo.txt';
+
+ my $ok = open my $fh, '<', $filename;
+ if (!$ok) {
+ $self->internal_server_error( { Error => "Error getting file
$filename" } );
+ return;
+ }
+
+ # slurp it in..
+ local $/;
+ my $data = <$fh>;
+
+ $self->res->headers->content_type("application/download");
+ $self->res->headers->content_disposition( "attachment; filename=\"" .
$filename . "\"" );
+ $self->render( data => $data );
+ close $fh;
+#
+#
+# my $response = $self->generate_iso($params);
+# return $self->success( $response, "Generate ISO was successful." );
}
sub generate_iso {
diff --git a/traffic_portal/app/src/common/api/ToolsService.js
b/traffic_portal/app/src/common/api/ToolsService.js
index e0ef32514..f1717775f 100644
--- a/traffic_portal/app/src/common/api/ToolsService.js
+++ b/traffic_portal/app/src/common/api/ToolsService.js
@@ -36,20 +36,12 @@ var ToolsService = function($http, $q, Restangular,
locationUtils, messageModel,
};
this.generateISO = function(iso) {
- var request = $q.defer();
-
$http.post(ENV.api['root'] + "isos", iso)
.then(
function(result) {
- request.resolve(result.data.response);
- },
- function(fault) {
-
messageModel.setMessages(fault.data.alerts, false);
- request.reject();
+ download(result.data, "dlText.txt",
"text/plain");
}
);
-
- return request.promise;
};
};
diff --git
a/traffic_portal/app/src/common/modules/form/iso/FormISOController.js
b/traffic_portal/app/src/common/modules/form/iso/FormISOController.js
index 382ddf8c2..76ce134ef 100644
--- a/traffic_portal/app/src/common/modules/form/iso/FormISOController.js
+++ b/traffic_portal/app/src/common/modules/form/iso/FormISOController.js
@@ -47,11 +47,7 @@ var FormISOController = function(servers, osversions,
$scope, $anchorScroll, for
};
$scope.generate = function(iso) {
- toolsService.generateISO(iso)
- .then(function(result) {
- $anchorScroll(); // scrolls window to top
- messageModel.setMessages([ { level: 'success',
text: 'ISO created at ' + result.isoURL } ], false);
- });
+ toolsService.generateISO(iso);
};
$scope.hasError = formUtils.hasError;
diff --git a/traffic_portal/app/src/index.html
b/traffic_portal/app/src/index.html
index de299cd06..ea5a68879 100644
--- a/traffic_portal/app/src/index.html
+++ b/traffic_portal/app/src/index.html
@@ -44,6 +44,8 @@
<div class="app container body" ui-view></div>
+ <script
src="https://cdnjs.cloudflare.com/ajax/libs/downloadjs/1.4.8/download.js";></script>
+
<script src="resources/assets/js/shared-libs.js"></script>
<script src="resources/assets/js/app.js"></script>
<script src="resources/assets/js/config.js"></script>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
