Permalink
Browse files

Merge branch 'xtuple'

  • Loading branch information...
2 parents 6384fca + d4cbb09 commit 731858572b82c81142b36069f1e1e4bfa171e7a1 @bendiy committed Apr 11, 2013
Showing with 44 additions and 2 deletions.
  1. +42 −0 node-datasource/database/orm/models/org.json
  2. +2 −2 node-datasource/routes/report.js
@@ -313,6 +313,48 @@
],
"isSystem": true
},
+ {
+ "context": "xtuple",
+ "nameSpace": "XM",
+ "type": "OrganizationExtension",
+ "table": "xt.orgext",
+ "idSequenceName": "orgext_orgext_id_seq",
+ "comment": "Organization Extension Map",
+ "privileges": {
+ "all": {
+ "create": true,
+ "read": true,
+ "update": false,
+ "delete": true
+ }
+ },
+ "properties": [
+ {
+ "name": "id",
+ "attr": {
+ "type": "Number",
+ "column": "orgext_id",
+ "isPrimaryKey": true
+ }
+ },
+ {
+ "name": "organization",
+ "attr": {
+ "type": "String",
+ "column": "orgext_org_name"
+ }
+ },
+ {
+ "name": "extension",
+ "toOne": {
+ "isNested": true,
+ "type": "Extension",
+ "column": "orgext_ext_id"
+ }
+ }
+ ],
+ "isSystem": true
+ },
{
"context": "xtuple",
"nameSpace": "XM",
@@ -76,7 +76,8 @@ regexp:true, undef:true, strict:true, trailing:true, white:true */
var queryForDataCallback = function (result) {
var recordType = requestDetails.query ? requestDetails.query.recordType : requestDetails.recordType,
- modelName = recordType.suffix().replace("ListItem", "").replace("Relation", "");
+ modelName = recordType.suffix().replace("ListItem", "").replace("Relation", ""),
+ fileName = recordType.suffix().replace("ListItem", "List").replace("Relation", "List") + ".prpt";
if (result.isError) {
res.send(result);
@@ -102,7 +103,6 @@ regexp:true, undef:true, strict:true, trailing:true, white:true */
},
success = function () {
var biUrl = X.options.datasource.biUrl || "",
- fileName = modelName + "List.prpt",
redirectUrl = biUrl + "&name=" + fileName + "&dataKey=" + randomKey;
if (requestDetails.locale && requestDetails.locale.culture) {

0 comments on commit 7318585

Please sign in to comment.