summaryrefslogtreecommitdiffstats
path: root/afm-client/app/Frontend
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2016-04-15 22:01:37 +0200
committerJosé Bollo <jose.bollo@iot.bzh>2016-04-15 22:01:37 +0200
commit922b183f441a6e68b55592596fa62cc6e1814f74 (patch)
tree4da858e9fe8d322bca6211a8a82a5f0651d373a3 /afm-client/app/Frontend
parentb7fc92a77ba73e983eed280d769c8f7a86b0db3a (diff)
update to afb-daemon evolutions
- change the jtype - names uploaded widgets 'widget' Change-Id: I4634f71f820ba9c6619d944dd68b0238ed649a23 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'afm-client/app/Frontend')
-rw-r--r--afm-client/app/Frontend/pages/Dashboard/Dashboard.html2
-rw-r--r--afm-client/app/Frontend/pages/Dashboard/DashboardModule.js4
-rw-r--r--afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js8
3 files changed, 7 insertions, 7 deletions
diff --git a/afm-client/app/Frontend/pages/Dashboard/Dashboard.html b/afm-client/app/Frontend/pages/Dashboard/Dashboard.html
index 6679b94..b5a9089 100644
--- a/afm-client/app/Frontend/pages/Dashboard/Dashboard.html
+++ b/afm-client/app/Frontend/pages/Dashboard/Dashboard.html
@@ -15,7 +15,7 @@ animationIn: slideInRight
<div class="button-box box-content ">
<appli-button ng-repeat="appliID in ctrl.appliIDs" store="ctrl.appliStore" handle="{{appliID}}" callback="ctrl.AppliCB"> </appli-button>
- <upload-appli class="ibz-right" label="Upload" icon="fi-upload" posturl="/api/afm-main/install" callback="ctrl.FileUploaded" title="Upload AGL App"></upload-appli>
+ <upload-appli class="ibz-right" label="Upload" name="widget" icon="fi-upload" posturl="/api/afm-main/install" callback="ctrl.FileUploaded" title="Upload AGL App"></upload-appli>
</div>
diff --git a/afm-client/app/Frontend/pages/Dashboard/DashboardModule.js b/afm-client/app/Frontend/pages/Dashboard/DashboardModule.js
index a52e5b6..dff21ed 100644
--- a/afm-client/app/Frontend/pages/Dashboard/DashboardModule.js
+++ b/afm-client/app/Frontend/pages/Dashboard/DashboardModule.js
@@ -42,7 +42,7 @@ angular.module('DashboardModule', ['SubmitButton', 'TokenRefresh', 'AppliButton'
}
// Check this is a valid response from Binder
- if (response.data.request.jtype !== "AJB_reply" && response.data.request.api !== "runnables") {
+ if (response.data.jtype != "afb-reply") {
Notification.error ({message: "Invalid Respond to /opa/afm-main/runnable response.data="+response.data, delay: 5000});
return;
}
@@ -78,4 +78,4 @@ angular.module('DashboardModule', ['SubmitButton', 'TokenRefresh', 'AppliButton'
});
console.log ("Dashboard Controller Loaded");
-})(); \ No newline at end of file
+})();
diff --git a/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js b/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js
index f2d2056..269ee81 100644
--- a/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js
+++ b/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js
@@ -87,7 +87,7 @@
case "start":
if (scope.runstatus !== "stop") return;
AppCall.get ("afm-main", "start", {id: scope.appID, mode: scope.runmode}, function(response) {
- if (response.status !== 200 || response.data.jtype !== "AJB_reply") {
+ if (response.status !== 200 || response.data.jtype !== "afb-reply") {
notifyError ("start", response);
return;
}
@@ -102,7 +102,7 @@
if (scope.runstatus !== "start") return;
AppCall.get ("afm-main", "terminate", {runid: scope.runID}, function(response) {
- if (response.status !== 200 || response.data.jtype !== "AJB_reply") {
+ if (response.status !== 200 || response.data.jtype !== "afb-reply") {
notifyError ("stop", response);
return;
}
@@ -120,7 +120,7 @@
case "info":
AppCall.get ("afm-main", "detail", {id: scope.appID}, function(response) {
- if (response.status !== 200 || response.data.jtype !== "AJB_reply") {
+ if (response.status !== 200 || response.data.jtype !== "afb-reply") {
notifyError ("detail", response);
return;
}
@@ -145,7 +145,7 @@
case "uninstall":
if (scope.runstatus !== "stop") return;
AppCall.get ("afm-main", "uninstall", {id: scope.appID}, function(response) {
- if (response.status !== 200 || response.data.jtype !== "AJB_reply") {
+ if (response.status !== 200 || response.data.jtype !== "afb-reply") {
notifyError ("uninstall", response);
return;
}