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

Merge branch '1.9.1' into devel

Browse source
This commit is contained in:
James 2011-08-31 10:15:00 -04:00
commit c460519a88
5 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/controllers/LibraryController.php
View file

@ -178,9 +178,10 @@ class LibraryController extends Zend_Controller_Action
{
$request = $this->getRequest();
$form = new Application_Form_EditAudioMD();
$file_id = $this->_getParam('id', null);
$file = StoredFile::Recall($file_id);
$form->populate($file->getDbColMetadata());
if ($request->isPost()) {
if ($form->isValid($request->getPost())) {
@ -196,7 +197,6 @@ class LibraryController extends Zend_Controller_Action
}
}
$form->populate($file->getDbColMetadata());
$this->view->form = $form;
}

6
airtime_mvc/application/forms/EditAudioMD.php
View file

@ -29,21 +29,15 @@ class Application_Form_EditAudioMD extends Zend_Form
// Add title field
$this->addElement('text', 'track_title', array(
'label' => 'Title:',
'required' => true,
'class' => 'input_text',
'filters' => array('StringTrim'),
'validators' => array(
'NotEmpty',
)
));
// Add artist field
$this->addElement('text', 'artist_name', array(
'label' => 'Artist:',
'required' => true,
'class' => 'input_text',
'filters' => array('StringTrim'),
'validators' => array('NotEmpty')
));
// Add album field