1 files changed, 63 insertions, 39 deletions
diff --git a/module/web/static/js/models/Package.js b/module/web/static/js/models/Package.js
index e5b0dc5a7..5a2940c66 100644
--- a/module/web/static/js/models/Package.js
+++ b/module/web/static/js/models/Package.js
@@ -1,52 +1,76 @@
-define(['jquery', 'backbone', 'underscore'], function($, Backbone, _) {
+define(['jquery', 'backbone', 'underscore', 'collections/FileList', 'require'],
+    function($, Backbone, _, FileList, require) {
 
-    return Backbone.Model.extend({
+        return Backbone.Model.extend({
 
-        idAttribute: 'pid',
+            idAttribute: 'pid',
 
-        defaults: {
-            pid: -1,
-            name : null,
-            folder: "",
-            root: -1,
-            owner: -1,
-            site: "",
-            comment: "",
-            password: "",
-            added: -1,
-            status: -1,
-            packageorder: -1,
-            stats: null,
-            fids: null,
-            pids: null,
-            files: null, // Collection
-            packs: null // Collection
-        },
+            defaults: {
+                pid: -1,
+                name: null,
+                folder: "",
+                root: -1,
+                owner: -1,
+                site: "",
+                comment: "",
+                password: "",
+                added: -1,
+                status: -1,
+                packageorder: -1,
+                stats: null,
+                fids: null,
+                pids: null,
+                files: null, // Collection
+                packs: null // Collection
+            },
 
-        // Model Constructor
-        initialize: function() {
+            // Model Constructor
+            initialize: function() {
+            },
 
-        },
+            // Changes url + method and delegates call to super class
+            fetch: function(options) {
+                options || (options = {});
+                options.url = 'api/getFileTree/' + this.get('pid') + '/false';
+                options.type = "post";
 
-        // Changes url + method and delegates call to super class
-        fetch: function(options) {
-            options || (options = {});
-            options.url = 'api/getPackageInfo/' + this.get('pid');
-            options.type = "post";
+                return Backbone.Model.prototype.fetch.call(this, options);
+            },
 
-            return Backbone.Model.prototype.fetch.call(options);
+            save: function(options) {
+                // TODO
+            },
 
-        },
+            destroy: function(options) {
+                options || (options = {});
+                // TODO: as post data
+                options.url = 'api/deletePackages/[' + this.get('pid') + ']';
+                options.type = "post";
 
-        save: function(options) {
-            // TODO
-        },
+                return Backbone.Model.prototype.destroy.call(this, options);
+            },
 
-        // Any time a model attribute is set, this method is called
-        validate: function(attrs) {
+            parse: function(resp, xhr) {
+                // Package is loaded from tree collection
+                if (_.has(resp, 'root')) {
+                    resp.root.files = new FileList(_.values(resp.files));
+                    // circular dependencies needs to be avoided
+                    var PackageList = require('collections/PackageList');
+                    resp.root.packs = new PackageList(_.values(resp.packages));
+                    return resp.root;
+                }
+                return Backbone.model.prototype.fetch.call(this, resp, xhr);
+            },
 
-        }
+            // Package data is complete when it contains collection for containing files or packs
+            isLoaded: function() {
+                return this.has('files');
+            },
 
-    });
+            // Any time a model attribute is set, this method is called
+            validate: function(attrs) {
 
-});
-\ No newline at end of file
+            }
+
+        });
+    });
+\ No newline at end of file