added error messages for unlogged users

js/erp5_loader.js

@@ -733,13 +733,24 @@
         // access storage
         return jIO.util.ajax(config)
           .then(function(response) {
+            var parsed = util.parse(response.target.responseText),
+              me = parsed.me,
+              flux = flux || {};
+            if (!me) {
+              return {"pass": pass};
+            } else {
               return jIO.util.ajax({
-              "url": util.parse(response.target.responseText)._links.me.href,
+                "url": me.href,
                 "xhrFields": {
                   "withCredentials": true
                 }
               });
+            }
           }).then(function (answer) {
+            if (answer.pass) {
+              flux.not_logged_in = true;
+              return {"pass": pass};
+            } else {
               reply =  util.parse(answer.target.responseText)._links.slapos_jump;
               for (i = 0; i < reply.length; i += 1) {
                 if (reply[i].name === "current_ticket") {
@@ -755,15 +766,11 @@
               pass.config.initial_query.skip_type = true;
               pass.config.initial_query.query = query;
               // pass hacked query back into chain
-            if (reply.response) {
               return {
                 "response": util.parse(reply.response),
                 "pass": pass
               };
             }
-            return {
-              "pass": pass
-            }
           }).fail(util.error);
       }
       return (reply);
@@ -830,13 +837,24 @@
         // access storage
         return jIO.util.ajax(config)
           .then(function(response) {
+            var parsed = util.parse(response.target.responseText),
+              me = parsed.me,
+              flux = flux || {};
+            if (!me) {
+              return {"pass": pass};
+            } else {
               return jIO.util.ajax({
-              "url": util.parse(response.target.responseText)._links.me.href,
+                "url": me.href,
                 "xhrFields": {
                   "withCredentials": true
                 }
               });
+            }
           }).then(function (answer) {
+            if (answer.pass) {
+              flux.not_logged_in = true;
+              return {"pass": pass};
+            } else {
               reply =  util.parse(answer.target.responseText)._links.slapos_jump;
               for (i = 0; i < reply.length; i += 1) {
                 if (reply[i].name === "current_computer") {
@@ -851,15 +869,11 @@
               }
               pass.config.initial_query.query = query;
               // pass hacked query back into chain
-            if (reply.response) {
               return {
                 "response": util.parse(reply.response),
                 "pass": pass
               };
             }
-            return {
-              "pass": pass
-            }
           }).fail(util.error);
       }
       return (reply);
@@ -885,13 +899,25 @@
         // access storage
         return jIO.util.ajax(config)
           .then(function(response) {
+            var parsed = util.parse(response.target.responseText),
+              me = parsed.me,
+              flux = flux || {};
+            if (!me) {
+              flux.not_logged_in = true;
+              return {"pass": pass};
+            } else {
               return jIO.util.ajax({
-              "url": util.parse(response.target.responseText)._links.me.href,
+                "url": me.href,
                 "xhrFields": {
                   "withCredentials": true
                 }
               });
+            }
           }).then(function (answer) {
+            if (answer.pass) {
+              flux.not_logged_in = true;
+              return {"pass": pass};
+            } else {
               reply =  util.parse(answer.target.responseText)._links.slapos_jump;
               for (i = 0; i < reply.length; i += 1) {
                 if (reply[i].name === "current_invoice") {
@@ -906,15 +932,11 @@
               }
               pass.config.initial_query.query = query;
               // pass hacked query back into chain
-            if (reply.response) {
               return {
                 "response": util.parse(reply.response),
                 "pass": pass
               };
             }
-            return {
-              "pass": pass
-            }
           }).fail(util.error);
       }
       return (reply);
@@ -940,13 +962,26 @@
         // access storage
         return jIO.util.ajax(config)
           .then(function(response) {
+            var parsed = util.parse(response.target.responseText),
+              me = parsed.me,
+              flux = flux || {};
+            if (!me) {
+              return {
+                "pass": pass
+              }
+            } else {
               return jIO.util.ajax({
-              "url": util.parse(response.target.responseText)._links.me.href,
+                "url": me.href,
                 "xhrFields": {
                   "withCredentials": true
                 }
             });
+            }
           }).then(function (answer) {
+            if (answer.pass) {
+              flux.not_logged_in = true;
+              return {"pass": pass};
+            } else {
               reply =  util.parse(answer.target.responseText)._links.slapos_jump;
               for (i = 0; i < reply.length; i += 1) {
                 if (reply[i].name === "current_network") {
@@ -961,15 +996,11 @@
               }
               pass.config.initial_query.query = query;
               // pass hacked query back into chain
-            if (reply.response) {
               return {
                 "response": util.parse(reply.response),
                 "pass": pass
               };
             }
-            return {
-              "pass": pass
-            }
           }).fail(util.error);
       }
       return (reply);
@@ -996,13 +1027,24 @@
         // access storage
         return jIO.util.ajax(config)
           .then(function(response) {
+            var parsed = util.parse(response.target.responseText),
+              me = parsed.me,
+              flux = flux || {};
+            if (!me) {
+              return {"pass": pass};
+            } else {
               return jIO.util.ajax({
-              "url": util.parse(response.target.responseText)._links.me.href,
+                "url": me.href,
                 "xhrFields": {
                   "withCredentials": true
                 }
               });
+            }
           }).then(function (answer) {
+            if (answer.pass) {
+              flux.not_logged_in = true;
+              return {"pass": pass};
+            } else {
               reply =  util.parse(answer.target.responseText)._links.slapos_jump;
               for (i = 0; i < reply.length; i += 1) {
                 if (reply[i].name === "current_hosting_subscription") {
@@ -1017,15 +1059,11 @@
               }
               pass.config.initial_query.query = query;
               // pass hacked query back into chain
-            if (reply.response) {
               return {
                 "response": util.parse(reply.response),
                 "pass": pass
               };
             }
-            return {
-              "pass": pass
-            }
           }).fail(util.error);
       }
       return (reply);
@@ -1179,7 +1217,6 @@
           // store answer in flux
           flux = flux || {};
           flux.cert = util.parse(answer.target.responseText);
-          console.log("SET")
           if (id && obj.state.callback) {
             $.mobile.changePage(obj.state.callback.replace("__id__", decode ? id : window.encodeURIComponent(id)));
           }
@@ -6281,7 +6318,7 @@
 
     // update info fields
     // TODO: parentNode is not a proper selector, this should be done
-    // by storing info fields associated with a gadget in state and
+    // by saving info fields associated with a gadget in state and
     // updating from there!
     app.setInfo(
       config.gadget.parentNode,
@@ -7129,6 +7166,10 @@
       return util.error("makeContent: Missing constructor");
     }
 
+    // HACK ERP5
+    if (flux.not_logged_in) {
+      util.loader("", "status_dict.please_login", "lock");
+    }
     // set data depending on auth
     if (pass.no_auth || (pass.auth && pass.active_login)) {
       data = reply.response ? util.parse(reply.response) : null;
@@ -7409,9 +7450,6 @@
 
       if (store && items.length > 0) {
 
-        // show some status
-        util.loader("", "status_dict.storing");
-
         // as store will also be called directly and may require field
         // definitions for validating what is being stored, we may fetch
         // field definitions here again. When called in the setContent
@@ -7439,7 +7477,7 @@
               delete answer.pass.undo_skip;
 
             // if we have an answer = field definitions, the record fields
-            // must be validated before storing, so we don't store a field
+            // must be validated before saving, so we don't store a field
             // that does not exist
             } else {
               if (answer.response) {
@@ -7450,6 +7488,7 @@
             }
             // if we have form_data we continue
             if (pass.form_data === undefined) {
+
               util.loader("", "status_dict.saving");
               // loop over item and create a JIO record
               for (i = 0; i < pass.items.length; i += 1) {
@@ -7489,6 +7528,7 @@
               }
             } else {
               // do it again, Sam...
+              util.loader("", "status_dict.saving");
               promises[0] = jIO.util.ajax({
                 "url": storage.items.dict.url,
                 "type": "GET",
@@ -7497,14 +7537,23 @@
                 }
               })
               .then(function(response) {
+                var parsed = util.parse(response.target.responseText),
+                  me = parsed.me,
+                  flux = flux || {};
+                if (!me) {
+                  flux.not_logged_in = true;
+                  return {"pass": pass};
+                } else {
                   return jIO.util.ajax({
-                  "url": util.parse(response.target.responseText)._links.me.href,
+                    "url": me.href,
                     "xhrFields": {
                       "withCredentials": true
                     }
                   });
+                }
               })
               .then(function (answer) {
+                if (answer.target) {
                   return jIO.util.ajax({
                     "url": util.parse(answer.target.responseText)._actions[pass.fetch].href,
                     "type": "POST",
@@ -7513,25 +7562,32 @@
                       "withCredentials": true
                     }
                   });
+                }
               })
               .then(function (erp5_response) {
+                if (erp5_response) {
                   header = erp5_response.target.getResponseHeader("Location");
                   return RSVP.resolve({
                     "status": 200,
                     "foo": "bar",
                     "location": header
                   });
+                }
               })
               .fail(util.error);
             }
 
             return RSVP.all(promises)
               .then(function (response) {
+                if (response[0] === undefined) {
+                  util.loader("", "status_dict.please_login", "ban-circle");
+                } else {
                   util.loader("", "status_dict.success", "check");
                   // for single item actions, allow to return a status message
                   if (response.length === 1 && reply.pass.reply) {
                     send_status = response[0];
                   }
+                }
                 return {
                   "response": send_status,
                   "pass": pass

lang/en-EN/dict.json

@@ -53,6 +53,7 @@
     "find_out_more_details": "For additional information, please refer to the following sections:"
   },
   "status_dict": {
+    "please_login": "Please log into SlapOS in another tab",
     "loading_set": "Loading Records",
     "loading_fields": "Loading Configuration",
     "ssl_error": "Please revoke existing certificate first",
@@ -61,7 +62,6 @@
     "not_found": "Page not found",
     "uploading": "Uploading",
     "fetching": "Fetching Data",
-    "storing": "Storing Data",
     "downloading": "Downloading",
     "rendering": "Rendering",
     "saving": "Saving",