Skip to content

pc_backendのトピックリスト・イベントリスト・トピックコメントリスト・イベントコメントリストの並び順を新しい順にする(fix #1679) #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
77web wants to merge 2 commits into
base: stable-1.0.x
Choose a base branch
from
Open

pc_backendのトピックリスト・イベントリスト・トピックコメントリスト・イベントコメントリストの並び順を新しい順にする(fix #1679) #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ebb354
fixed ordering in pc_backend communityTopic list, communityEvent list…
77web Dec 28, 2011
fba2da9
add functional test for this fix
77web Dec 28, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions apps/pc_backend/modules/communityTopic/actions/actions.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public function executeTopicList(sfWebRequest $request)
{
$this->pager->setQuery($this->form->getQuery());
}
$this->pager->setQuery($this->pager->getQuery()->orderBy('created_at DESC'));
$this->pager->setPage($request->getParameter('page', 1));
$this->pager->init();
return sfView::SUCCESS;
Expand Down Expand Up @@ -82,6 +83,7 @@ public function executeTopicCommentList(sfWebRequest $request)
{
$this->pager->setQuery($this->form->getQuery());
}
$this->pager->setQuery($this->pager->getQuery()->orderBy('created_at DESC'));
$this->pager->setPage($request->getParameter('page', 1));
$this->pager->init();
return sfView::SUCCESS;
Expand Down Expand Up @@ -122,6 +124,7 @@ public function executeEventList(sfWebRequest $request)
{
$this->pager->setQuery($this->form->getQuery());
}
$this->pager->setQuery($this->pager->getQuery()->orderBy('created_at DESC'));
$this->pager->setPage($request->getParameter('page', 1));
$this->pager->init();
return sfView::SUCCESS;
Expand Down Expand Up @@ -202,6 +205,7 @@ public function executeEventCommentList(sfWebRequest $request)
{
$this->pager->setQuery($this->form->getQuery());
}
$this->pager->setQuery($this->pager->getQuery()->orderBy('created_at DESC'));
$this->pager->setPage($request->getParameter('page', 1));
$this->pager->init();
return sfView::SUCCESS;
Expand Down
55 changes: 55 additions & 0 deletions test/functional/pc_backend/communityTopicEventCommentListOrderingTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?php

include(dirname(__FILE__).'/../../bootstrap/functional.php');
include(dirname(__FILE__).'/../../bootstrap/database.php');

$_app = 'pc_backend';
$browser = new opTestFunctional(new opBrowser(), new lime_test(null, new lime_output_color()));
$browser
->info('Login')
->get('/default/login')
->click('ログイン', array('admin_user' => array(
'username' => 'admin',
'password' => 'password',
)))
->with('user')->isAuthenticated();

$browser->get('/communityTopic/topicList')
->with('request')->begin()
->isParameter('module', 'communityTopic')
->isParameter('action', 'topicList')
->end()
->with('response')->begin()
->isStatusCode(200)
->end()
;

$browser->get('/communityTopic/eventList')
->with('request')->begin()
->isParameter('module', 'communityTopic')
->isParameter('action', 'eventList')
->end()
->with('response')->begin()
->isStatusCode(200)
->end()
;

$browser->get('/communityTopic/topicCommentList')
->with('request')->begin()
->isParameter('module', 'communityTopic')
->isParameter('action', 'topicCommentList')
->end()
->with('response')->begin()
->isStatusCode(200)
->end()
;

$browser->get('/communityTopic/eventCommentList')
->with('request')->begin()
->isParameter('module', 'communityTopic')
->isParameter('action', 'eventCommentList')
->end()
->with('response')->begin()
->isStatusCode(200)
->end()
;