From: Ɓukasz Rekucki Date: Tue, 29 Sep 2009 14:57:00 +0000 (+0200) Subject: Merge branch 'master' of stigma:platforma X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/e3cc953f09c067377e01d1e003927b969997edde?ds=inline;hp=--cc Merge branch 'master' of stigma:platforma Conflicts: project/static/js/models.js --- e3cc953f09c067377e01d1e003927b969997edde diff --cc project/static/js/models.js index f6725a5f,13dc2ea0..5d3fac49 --- a/project/static/js/models.js +++ b/project/static/js/models.js @@@ -204,15 -208,7 +209,15 @@@ Editor.ImageGalleryModel = Editor.Model alert('erroneous state:', this.get('state')); } - this.set('pages', data[0].pages); + $.log('galleries:', data); + + if (data.length == 0) + this.set('data', []); + else { + $.log('dupa'); + this.set('data', data[0].pages); - } - ++ } ++ this.set('state', 'synced'); },