diff --git a/configs/AppConfig.inc b/configs/AppConfig.inc index 1d4dde0a..6c3c03b6 100644 --- a/configs/AppConfig.inc +++ b/configs/AppConfig.inc @@ -136,7 +136,7 @@ 'ranking_range' => 2, 'achievements_range' => 3, 'title_delimiter' => ' – ', - 'questlist_limit' => 10 + 'lists_limit' => 10 ); @@ -223,6 +223,7 @@ array('^quests/(?!(index|create|createmedia))/?', 'quests/quest/$1', true), array('^characters/([^/]+)/(register|manage)/?$', 'characters/$2/$1', true), array('^characters/([^/]+)/?$', 'characters/index/$1', true), + array('^characters/([^/]+)/all/?$', 'characters/index/$1/all', true), array('^characters/([^/]+)/([^/]+)/(edit|delete)/?$', 'characters/$3/$1/$2', true), array('^characters/([^/]+)/(?!(index|register|manage))/?', 'characters/character/$1/$2', true), array('^charactergroups/([^/]+)/?$', 'charactergroups/index/$1', true), diff --git a/controllers/QuestsController.inc b/controllers/QuestsController.inc index b0480943..fb68e11a 100644 --- a/controllers/QuestsController.inc +++ b/controllers/QuestsController.inc @@ -96,7 +96,7 @@ } // Get Quests - $limit = ($all != 'all') ? \nre\configs\AppConfig::$misc['questlist_limit'] : null; + $limit = ($all != 'all') ? \nre\configs\AppConfig::$misc['lists_limit'] : null; $offset = ($all != 'all') ? max((intval($page) - 1), 0) * $limit : 0; $questsCount = $this->Quests->getCountForQuestsForSeminaryByOpenSubmissions($seminary['id'], $selectedQuestgroup, $selectedQuesttype); $quests = $this->Quests->getQuestsForSeminaryByOpenSubmissions($seminary['id'], $selectedQuestgroup, $selectedQuesttype, $limit, $offset); diff --git a/views/html/quests/index.tpl b/views/html/quests/index.tpl index 136bee60..7944e295 100644 --- a/views/html/quests/index.tpl +++ b/views/html/quests/index.tpl @@ -123,7 +123,7 @@ } }); request.fail(function (jqXHR, textStatus, errorThrown) { - alert("fail: " + textStatus + ": " +errorThrown); + window.location.href = linkPage.replace('PAGE', page); });