@saltcorn/server 0.6.3-beta.3 → 0.6.3

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.6.3-beta.3",
+  "version": "0.6.3",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.6.3-beta.3",
-    "@saltcorn/builder": "0.6.3-beta.3",
-    "@saltcorn/data": "0.6.3-beta.3",
+    "@saltcorn/base-plugin": "0.6.3",
+    "@saltcorn/builder": "0.6.3",
+    "@saltcorn/data": "0.6.3",
     "greenlock-express": "^4.0.3",
-    "@saltcorn/markup": "0.6.3-beta.3",
-    "@saltcorn/sbadmin2": "0.6.3-beta.3",
+    "@saltcorn/markup": "0.6.3",
+    "@saltcorn/sbadmin2": "0.6.3",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "connect-flash": "^0.1.1",

package/public/saltcorn.js

@@ -30,7 +30,10 @@ function add_repeater(nm) {
 function apply_showif() {
   $("[data-show-if]").each(function (ix, element) {
     var e = $(element);
-    var to_show = new Function("e", "return " + e.attr("data-show-if"));
+    var to_show = new Function(
+      "e",
+      "return " + decodeURIComponent(e.attr("data-show-if"))
+    );
     if (to_show(e))
       e.show()
         .find("input, textarea, button, select")
@@ -510,6 +513,33 @@ function ajax_modal(url, opts = {}) {
     },
   });
 }
+
+function saveAndContinue(e) {
+  var form = $(e).closest("form");
+  var url = form.attr("action");
+  var form_data = form.serialize();
+  $.ajax(url, {
+    type: "POST",
+    headers: {
+      "CSRF-Token": _sc_globalCsrf,
+    },
+    data: form_data,
+    success: function (res) {
+      if (res.id && form.find("input[name=id")) {
+        form.append(
+          `<input type="hidden" class="form-control  " name="id" value="${res.id}">`
+        );
+      }
+    },
+    error: function (request) {
+      $("#page-inner-content").html(request.responseText);
+      initialize_page();
+    },
+  });
+
+  return false;
+}
+
 function ajaxSubmitForm(e) {
   var form = $(e).closest("form");
   var url = form.attr("action");

package/routes/list.js

@@ -155,6 +155,10 @@ const typeToJsGridType = (t, field) => {
     jsgField.editing = false;
     jsgField.inserting = false;
   }
+  if (field.primary_key) {
+    jsgField.inserting = false;
+    jsgField.editing = false;
+  }
   return jsgField;
 };
 

package/routes/pageedit.js

@@ -157,9 +157,12 @@ const pageBuilderData = async (req, context) => {
   const images = await File.find({ mime_super: "image" });
   const roles = await User.get_roles();
   const stateActions = getState().actions;
-  const actions = Object.entries(stateActions)
-    .filter(([k, v]) => !v.requireRow && !v.disableInBuilder)
-    .map(([k, v]) => k);
+  const actions = [
+    "GoBack",
+    ...Object.entries(stateActions)
+      .filter(([k, v]) => !v.requireRow && !v.disableInBuilder)
+      .map(([k, v]) => k),
+  ];
   const triggers = await Trigger.find({
     when_trigger: { or: ["API call", "Never"] },
   });