Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
James 2013-01-10 14:52:45 -05:00
commit 55fa8b8dc1
15 changed files with 30 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/forms/EditUser.php
View file

@ -18,7 +18,7 @@ class Application_Form_EditUser extends Zend_Form
$emailValidator = Application_Form_Helper_ValidationTypes::overrideEmailAddressValidator();
$this->setDecorators(array(
array('ViewScript', array('viewScript' => 'form/edit-user.phtml'))));
array('ViewScript', array('viewScript' => 'form/edit-user.phtml', "currentUser" => $currentUser->getLogin()))));
$this->setAttrib('id', 'current-user-form');
$hidden = new Zend_Form_Element_Hidden('cu_user_id');

2
airtime_mvc/application/forms/RegisterAirtime.php
View file

@ -7,7 +7,7 @@ class Application_Form_RegisterAirtime extends Zend_Form
public function init()
{
$this->setAction('/Showbuilder');
$this->setAction(Application_Common_OsPath::getBaseDir().'/Showbuilder');
$this->setMethod('post');
$country_list = Application_Model_Preference::GetCountryList();