Merge remote-tracking branch 'origin/master' into hunternif

# Conflicts:
#	client/css/post-content-control.styl
#	client/css/post-list-view.styl
#	client/html/post_edit_sidebar.tpl
#	client/js/controllers/post_list_controller.js
#	client/js/controllers/post_main_controller.js
#	client/js/controllers/post_upload_controller.js
#	client/js/controllers/tag_controller.js
#	client/js/controllers/user_list_controller.js
#	client/js/controls/expander_control.js
#	client/js/controls/post_content_control.js
#	client/js/controls/post_edit_sidebar_control.js
#	client/js/controls/post_readonly_sidebar_control.js
#	client/js/controls/tag_input_control.js
#	client/js/main.js
#	client/js/models/abstract_list.js
#	client/js/models/post.js
#	client/js/models/post_list.js
#	client/js/models/settings.js
#	client/js/models/tag.js
#	client/js/models/tag_list.js
#	client/js/tags.js
#	client/js/util/search.js
#	client/js/util/touch.js
#	client/js/util/uri.js
#	client/js/util/views.js
#	client/js/views/post_main_view.js
#	client/js/views/post_upload_view.js
#	client/js/views/posts_header_view.js
#	client/js/views/posts_page_view.js
#	client/js/views/settings_view.js
#	client/js/views/tag_view.js
#	client/package-lock.json
#	client/package.json
#	server/config.yaml.dist
#	server/szurubooru/api/__init__.py
#	server/szurubooru/api/post_api.py
#	server/szurubooru/api/tag_api.py
#	server/szurubooru/func/posts.py
#	server/szurubooru/func/tags.py
#	server/szurubooru/model/__init__.py
#	server/szurubooru/model/post.py
#	server/szurubooru/model/tag.py
#	server/szurubooru/search/configs/__init__.py
#	server/szurubooru/search/configs/post_search_config.py
#	server/szurubooru/search/executor.py
#	server/szurubooru/tests/api/test_post_retrieving.py
#	server/szurubooru/tests/api/test_post_updating.py
#	server/szurubooru/tests/api/test_tag_updating.py
#	server/szurubooru/tests/conftest.py
#	server/szurubooru/tests/func/test_posts.py
#	server/szurubooru/tests/func/test_tags.py
#	server/szurubooru/tests/search/configs/test_post_search_config.py

1 files changed, 25 insertions, 18 deletions

diff --git a/client/js/controllers/auth_controller.js b/client/js/controllers/auth_controller.js
index 2838e53..e01fb9b 100644
--- a/client/js/controllers/auth_controller.js
+++ b/client/js/controllers/auth_controller.js
@@ -1,33 +1,40 @@
-'use strict';
+"use strict";
 
-const router = require('../router.js');
-const api = require('../api.js');
-const uri = require('../util/uri.js');
-const topNavigation = require('../models/top_navigation.js');
-const LoginView = require('../views/login_view.js');
+const router = require("../router.js");
+const api = require("../api.js");
+const tags = require("../tags.js");
+const pools = require("../pools.js");
+const uri = require("../util/uri.js");
+const topNavigation = require("../models/top_navigation.js");
+const LoginView = require("../views/login_view.js");
 
 class LoginController {
     constructor() {
         api.forget();
-        topNavigation.activate('login');
-        topNavigation.setTitle('Login');
+        topNavigation.activate("login");
+        topNavigation.setTitle("Login");
 
         this._loginView = new LoginView();
-        this._loginView.addEventListener('submit', e => this._evtLogin(e));
+        this._loginView.addEventListener("submit", (e) => this._evtLogin(e));
     }
 
     _evtLogin(e) {
         this._loginView.clearMessages();
         this._loginView.disableForm();
         api.forget();
-        api.login(e.detail.name, e.detail.password, e.detail.remember)
-            .then(() => {
+        api.login(e.detail.name, e.detail.password, e.detail.remember).then(
+            () => {
                 const ctx = router.show(uri.formatClientLink());
-                ctx.controller.showSuccess('Logged in');
-            }, error => {
+                ctx.controller.showSuccess("Logged in");
+                // reload tag category color map, this is required when `tag_categories:list` has a permission other than anonymous
+                tags.refreshCategoryColorMap();
+                pools.refreshCategoryColorMap();
+            },
+            (error) => {
                 this._loginView.showError(error.message);
                 this._loginView.enableForm();
-            });
+            }
+        );
     }
 }
 
@@ -36,15 +43,15 @@ class LogoutController {
         api.forget();
         api.logout();
         const ctx = router.show(uri.formatClientLink());
-        ctx.controller.showSuccess('Logged out');
+        ctx.controller.showSuccess("Logged out");
     }
 }
 
-module.exports = router => {
-    router.enter(['login'], (ctx, next) => {
+module.exports = (router) => {
+    router.enter(["login"], (ctx, next) => {
         ctx.controller = new LoginController();
     });
-    router.enter(['logout'], (ctx, next) => {
+    router.enter(["logout"], (ctx, next) => {
         ctx.controller = new LogoutController();
     });
 };