@girder/core 3.2.13 → 3.2.15
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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@girder/core",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.15",
|
|
4
4
|
"description": "Extensible data management platform",
|
|
5
5
|
"homepage": "https://girder.readthedocs.org",
|
|
6
6
|
"bugs": {
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"bootstrap": "^3.4.1",
|
|
18
18
|
"bootstrap-switch": "~3.3.4",
|
|
19
19
|
"eonasdan-bootstrap-datetimepicker": "^4.17",
|
|
20
|
-
"@girder/fontello": "
|
|
20
|
+
"@girder/fontello": "^3.0.0",
|
|
21
21
|
"jquery": "^3.7.0",
|
|
22
22
|
"jsoneditor": "~5.9.3",
|
|
23
23
|
"moment": "^2.24.0",
|
|
@@ -112,10 +112,16 @@ var AssetstoresView = View.extend({
|
|
|
112
112
|
var assetstore = this.collection.get($(el).attr('cid'));
|
|
113
113
|
var capacity = assetstore.get('capacity');
|
|
114
114
|
var used = capacity.total - capacity.free;
|
|
115
|
+
if (capacity.reserved) {
|
|
116
|
+
used -= capacity.reserved;
|
|
117
|
+
}
|
|
115
118
|
var data = [
|
|
116
119
|
['Used (' + formatSize(used) + ')', used],
|
|
117
120
|
['Free (' + formatSize(capacity.free) + ')', capacity.free]
|
|
118
121
|
];
|
|
122
|
+
if (capacity.reserved) {
|
|
123
|
+
data.push(['Reserved (' + formatSize(capacity.reserved) + ')', capacity.reserved]);
|
|
124
|
+
}
|
|
119
125
|
var plot = $(el).jqplot([data], {
|
|
120
126
|
seriesDefaults: {
|
|
121
127
|
renderer: $.jqplot.PieRenderer,
|