X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=filex%2Fstatic%2Ffilex%2Ffilex.js;h=7eabdd28fb5869e76151886164bce6b87449b5e8;hb=1b85cda6547627731535b0b023adfda0e7d873a4;hp=18d78d41470e50ff866de865249da2b6c804c75c;hpb=8fa091024d4e474722fd81df48852625f926aa86;p=qcg-portal.git diff --git a/filex/static/filex/filex.js b/filex/static/filex/filex.js index 18d78d4..7eabdd2 100644 --- a/filex/static/filex/filex.js +++ b/filex/static/filex/filex.js @@ -141,8 +141,7 @@ $(function(){ var data = this.model.toJSON(); data['url_params'] = $.param({ host: this.view.host, - path: this.view.path.full(), - name: this.model.get('name') + path: this.view.path.full() + '/' + this.model.get('name') }); data['cid'] = this.model.cid; @@ -153,7 +152,11 @@ $(function(){ }, toggleHidden: function() { - this.$el.toggleClass('hidden', this.model.isHidden() && !this.view.showHidden()); + var isHidden = this.model.isHidden() && !this.view.showHidden(); + this.$el.toggleClass('hidden', isHidden); + + if (isHidden && this.model.get('checked')) + this.model.toggle(); }, toggleChecked: function(obj, value) { @@ -350,7 +353,7 @@ $(function(){ error: function(collection, response) { view.files.reset(); - var msg = (response.responseJSON || {}).msg || 'Błąd serwera'; + var msg = (response.responseJSON || {}).error || 'Błąd serwera'; view.$noItems.hide(); view.$error.find('.msg').text(msg);