X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Ftemplates%2Fqcg%2Fjob_new.html;h=966c5d293e8c16418aafe698b68dc282e4d30e25;hb=592985946dcdfd3ad3cd60fbe2d33b06b794bd70;hp=cac10a6ab733fb9c2e37496b42bc7e02b55e0a91;hpb=30676926ef79a0e6b9bade2ad277c82a322f5f3d;p=qcg-portal.git

diff --git a/qcg/templates/qcg/job_new.html b/qcg/templates/qcg/job_new.html
index cac10a6..966c5d2 100644
--- a/qcg/templates/qcg/job_new.html
+++ b/qcg/templates/qcg/job_new.html
@@ -12,7 +12,11 @@
     {% include 'filex/source.js.html' %}
 
     <script>
-        $(function() {
+        var filex = filex || {};
+
+        $(function () {
+            'use strict';
+
             var gridftpButton = $('<button/>', {
                 'type': 'button',
                 'class': 'btn btn-default pull-right',
@@ -21,7 +25,16 @@
                 'data-target': '#gridftp'
             });
 
-            $('#id_master_file,#id_executable,#id_preprocess_script,#id_postprocess_script').before(function() {
+            function fullPath(path, file) {
+                var res = path + file.get('name');
+
+                if (file.isDir())
+                    res += '/';
+
+                return res;
+            }
+
+            $('#id_master_file,#id_executable,#id_input,#id_preprocess_script,#id_postprocess_script').before(function() {
                 var target = this;
                 return gridftpButton.clone().click(function() {
                     $('#select-btn').off().click(function() {
@@ -32,7 +45,9 @@
                             return;
                         }
 
-                        var file = filex.host + filex.path.full() + '/' + selected[0].get('name');
+                        var file = fullPath(filex.host + '/' + filex.path.full() + '/', selected[0]);
+
+                        target.selectize.clear();
                         target.selectize.addOption({value: file, text: file});
                         target.selectize.addItem(file);
                         target.selectize.refreshItems();
@@ -43,15 +58,14 @@
                 });
             }).wrap('<div style="margin-right: 80px"></div>');
 
-            $('#id_input,#id_stage_in').before(function() {
+            $('#id_stage_in').before(function() {
                 var target = this;
                 return gridftpButton.clone().click(function() {
                     $('#select-btn').off().click(function() {
-                        var path = filex.host + filex.path.full() + '/';
+                        var path = filex.host + '/' + filex.path.full() + '/';
 
                         _.each(filex.selectedFiles(), function(item) {
-                            console.log(arguments);
-                            var file = path + item.get('name');
+                            var file = fullPath(path, item);
                             target.selectize.addOption({value: file, text: file});
                             target.selectize.addItem(file);
                         });