Merge pull request #1533 from shackbarth/23548-linguist

issue #23548: total batch processing for linguist translations

diff --git a/README.md b/README.md
index 4e348e1..879f68f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ a convenient, well-documented starting point into our project.
 ### Installing this project
 
 The best way to start coding on our stack is to use our
-[Vagrant setup](https://github.com/xtuple/xtuple-vagrant/blob/master/README.md).
+[Vagrant setup](https://github.com/xtuple/xtuple/wiki/Become-an-xTuple-Developer!).
 
 ### Release Notes
 

diff --git a/foundation-database/public/tables/metasql/projects-detail.mql b/foundation-database/public/tables/metasql/projects-detail.mql
index 9e17bb1..2954e7b 100644 (file)
--- a/foundation-database/public/tables/metasql/projects-detail.mql
+++ b/foundation-database/public/tables/metasql/projects-detail.mql
@@ -1458,6 +1458,9 @@ WHERE (true)
   AND project IN (SELECT poitem_prj_id FROM pohead JOIN poitem ON (pohead_id=poitem_pohead_id) 
                        WHERE pohead_id=<? value("pohead_id") ?>)
 <? endif ?>
+<? if exists("prjtype_id") ?>
+  AND project IN (SELECT prj_id FROM prj WHERE prj_prjtype_id = <? value("prjtype_id") ?>)
+<? endif ?>
 
 
 ORDER BY project, section, subtype, type, id;

diff --git a/test/lib/smoke.js b/test/lib/smoke.js
index 7bbd037..df0c588 100644 (file)
--- a/test/lib/smoke.js
+++ b/test/lib/smoke.js
@@ -45,6 +45,11 @@
     autoRegex = XM.Document.AUTO_NUMBER + "|" + XM.Document.AUTO_OVERRIDE_NUMBER;
     if (model instanceof XM.Document && model.numberPolicy.match(autoRegex)) {
       // wait for the model to fetch its id if appropriate
+      if (model.id) {
+        // the id is already defined? No need to wait for it from the server, then.
+        done(workspaceContainer);
+        return;
+      }
       eventName = "change:" + model.idAttribute;
       idChanged = function () {
         if (model.id) {