Skip to content

Commit

Permalink
0.8.2 Bump. Правка повтора вкладки "Ожидают подтверждения"
Browse files Browse the repository at this point in the history
  • Loading branch information
klimashkin committed Jul 20, 2013
1 parent aaca6b9 commit 3ad221a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pastvu",
"version": "0.8.2-dev",
"version": "0.8.2",
"description": "Retrospective topography of media content",
"homepage": "https://github.com/klimashkin/pastvu",
"keywords": ["oldmos", "pastvu"],
Expand Down
1 change: 1 addition & 0 deletions public/history.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
==================

* (fixed) Смена языка в формах авторизации
* (fixed) Повтор вкладки "Ожидают подтверждения"
* (tech) Отправитель заменен на noreply@pastvu.com
***
Полный список изменений: https://github.com/klimashkin/pastvu/compare/0.8.1...0.8.2
Expand Down
10 changes: 6 additions & 4 deletions public/js/module/main/bottomPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,12 @@ define(['underscore', 'Browser', 'Utils', 'socket', 'Params', 'knockout', 'knock
this.auth = globalVM.repository['m/common/auth'];
this.news = ko.observableArray();

if (this.auth.loggedIn() && this.auth.iAm.role() > 4) {
cats = catsMod.concat(cats);
}
this.catsObj = catsObj;
this.cats = ko.observableArray(cats);
if (this.auth.loggedIn() && this.auth.iAm.role() > 4 && catsMod.length) {
this.cats.concat(catsMod, true);
catsMod = []; //FIXME: Конкат изменяет исходный массив
}
this.catLoading = ko.observable('');
this.catActive = ko.observable('');

Expand Down Expand Up @@ -99,8 +100,9 @@ define(['underscore', 'Browser', 'Utils', 'socket', 'Params', 'knockout', 'knock

loggedInHandler: function () {
// После логина проверяем если мы можем добавить категории
if (this.auth.iAm.role() > 4) {
if (this.auth.iAm.role() > 4 && catsMod.length) {
this.cats.concat(catsMod, true);
catsMod = [];
this.catJump('photosToApprove');
}
this.subscriptions.loggedIn.dispose();
Expand Down

0 comments on commit 3ad221a

Please sign in to comment.