sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed #685

Browse Source 
* the admin controller loads the testing community as the default for new restaurants
* the Community model encapsulates the testing community fetching
* the view accepts not setting a default community
This commit is contained in:
Stuardo Rodríguez 2013-01-30 14:12:37 -05:00
parent 9932add0a3
commit 97018268ee
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/controllers/default/crunchbutton/admin/restaurants/index.php
View File

@ -18,7 +18,12 @@ class Controller_admin_restaurants extends Crunchbutton_Controller_Account
/* @var $view Cana_View */
$communities = Community::q('select * from community');
$community = $this->restaurant->community()->items()[0];
if (count($this->restaurant->community()->items())) {
$community = $this->restaurant->community()->items()[0];
} else {
$community = new Crunchbutton_Community();
$community = $community->getTest();
}
$view->communities = $communities;
$view->community = $community;
@ -35,8 +40,7 @@ class Controller_admin_restaurants extends Crunchbutton_Controller_Account
$this->restaurant = $restaurant;
if (c::getPagePiece(2) == 'new') {
c::view()->display('admin/restaurants/restaurant');
$this->_restaurantForm();
} elseif ($restaurant->id_restaurant) {
c::view()->restaurant = $restaurant;
switch (c::getPagePiece(3)) {

12
include/library/Crunchbutton/Community.php
View File

@ -75,4 +75,16 @@ class Crunchbutton_Community extends Cana_Table {
->idVar('id_community')
->load($id);
}
/**
* Returns the Testing community
*
* @return Crunchbutton_Community
*/
public function getTest()
{
$row = $this->q('SELECT * FROM community WHERE name="Testing" ')->current();
return $row;
}
}

2
include/views/default/crunchbutton/admin/restaurants/restaurant.phtml
View File

@ -230,7 +230,7 @@ input.notification {width: 400px;}
<select name="id_community" class="dataset-restaurant">
<? foreach ($this->communities as $community) : ?>
<? /* @var $community Crunchbutton_Community */ ?>
<option value="<?=$community->id_community?>" <?=_selectedCommunity($this->community, $community)?>>
<option value="<?=$community->id_community?>" <?=($this->community) ? _selectedCommunity($this->community, $community) : ''?>>
<?=$community->name?>
</option>
<? endforeach ; ?>