json-object-editor 0.10.225 → 0.10.226
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +1 -0
- package/js/joe-full.js +2 -1
- package/js/joe.js +2 -4
- package/package.json +2 -1
- package/server/schemas/list.js +19 -1
package/CHANGELOG.md
CHANGED
package/js/joe-full.js
CHANGED
|
@@ -2560,7 +2560,8 @@ if (__thisIsNewer) {
|
|
|
2560
2560
|
error('Queue', e);
|
|
2561
2561
|
}
|
|
2562
2562
|
}
|
|
2563
|
-
function Set (records) {
|
|
2563
|
+
/*function Set (records) {*/
|
|
2564
|
+
window.Set = function(records) {
|
|
2564
2565
|
/*|{
|
|
2565
2566
|
"info": "Collection class that filters out duplicate values",
|
|
2566
2567
|
"category": "Global",
|
package/js/joe.js
CHANGED
|
@@ -9382,7 +9382,7 @@ logit(intent)
|
|
|
9382
9382
|
logit(response);
|
|
9383
9383
|
var bucket = response.bucket || (_joe.Data.setting.where({name:'AWS_BUCKETNAME'})[0] || {value:''}).value;
|
|
9384
9384
|
var region = (_joe.Utils.Settings('AWS_S3CONFIG') ||{}).region;
|
|
9385
|
-
var prefix =
|
|
9385
|
+
var prefix = 'https://s3.'+((region && region +'.')||'')+'amazonaws.com/'+bucket+'/';
|
|
9386
9386
|
var url = prefix+response.Key;
|
|
9387
9387
|
var filename = response.Key.replace(self.current.object._id+'/','');
|
|
9388
9388
|
//TODO: change file status in list.
|
|
@@ -9421,9 +9421,7 @@ logit(intent)
|
|
|
9421
9421
|
logit(data);
|
|
9422
9422
|
var bucket = data.bucket || (_joe.Data.setting.where({name:'AWS_BUCKETNAME'})[0] || {value:''}).value;
|
|
9423
9423
|
|
|
9424
|
-
|
|
9425
|
-
var prefix = (_joe.Data.setting.where({name:'AWS_S3PREFIX'})[0] || {value:''}).value || 'https://s3.'+((region && region +'.')||'')+'amazonaws.com/'+bucket+'/';
|
|
9426
|
-
|
|
9424
|
+
var prefix = 'https://s3.amazonaws.com/'+bucket+'/';
|
|
9427
9425
|
var url = prefix+data.Key;
|
|
9428
9426
|
if(field.url_field){
|
|
9429
9427
|
var nprop = {};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "json-object-editor",
|
|
3
|
-
"version": "0.10.
|
|
3
|
+
"version": "0.10.226",
|
|
4
4
|
"description": "JOE the Json Object Editor | Platform Edition",
|
|
5
5
|
"main": "app.js",
|
|
6
6
|
"scripts": {
|
|
@@ -19,6 +19,7 @@
|
|
|
19
19
|
"keywords": [
|
|
20
20
|
"joe",
|
|
21
21
|
"json",
|
|
22
|
+
"object",
|
|
22
23
|
"editor"
|
|
23
24
|
],
|
|
24
25
|
"author": "Corey Hadden",
|
package/server/schemas/list.js
CHANGED
|
@@ -65,7 +65,24 @@ var schema = {
|
|
|
65
65
|
// return [{name:'view',action:'window.open(\'/API/plugin/reportbuilder/standard?itemid=${_id}\')'}];
|
|
66
66
|
// },
|
|
67
67
|
subsets:function(){
|
|
68
|
-
var filters = [
|
|
68
|
+
var filters = [
|
|
69
|
+
{name:'ACTIVE',default:true,filter:
|
|
70
|
+
function(){
|
|
71
|
+
|
|
72
|
+
if(!this.status){
|
|
73
|
+
return false;
|
|
74
|
+
}
|
|
75
|
+
else{
|
|
76
|
+
var s = _joe.Cache.get(this.status);
|
|
77
|
+
//var s = $.get(this.status);
|
|
78
|
+
if(s.inactive || s.terminal || s.default){
|
|
79
|
+
return false;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
return true;
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
];
|
|
69
86
|
var tags = _joe.Data.tag.filter(function(tag){
|
|
70
87
|
if(tag.datasets.indexOf(_joe.current.schema.__schemaname) != -1){
|
|
71
88
|
filters.push({name:tag.name,
|
|
@@ -73,6 +90,7 @@ var schema = {
|
|
|
73
90
|
});
|
|
74
91
|
}
|
|
75
92
|
});
|
|
93
|
+
|
|
76
94
|
filters.push({name:'untagged',
|
|
77
95
|
filter:{$or:[{tags:{$size:0}},{tags:{$exists:false}}]}
|
|
78
96
|
})
|