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

crlf fix

This commit is contained in:
Naomi 2013-08-12 15:08:09 -04:00
parent d83c004fb9
commit b65007868a
3 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
airtime_mvc/application/forms/EditHistory.php
View File

@ -113,35 +113,35 @@ class Application_Form_EditHistory extends Zend_Form
); );
public function init() { public function init() {
$history_id = new Zend_Form_Element_Hidden($this::ID_PREFIX.'id'); $history_id = new Zend_Form_Element_Hidden($this::ID_PREFIX.'id');
$history_id->setValidators(array( $history_id->setValidators(array(
new Zend_Validate_Int() new Zend_Validate_Int()
)); ));
$history_id->setDecorators(array('ViewHelper')); $history_id->setDecorators(array('ViewHelper'));
$this->addElement($history_id); $this->addElement($history_id);
$dynamic_attrs = new Zend_Form_SubForm(); $dynamic_attrs = new Zend_Form_SubForm();
$this->addSubForm($dynamic_attrs, $this::ID_PREFIX.'template'); $this->addSubForm($dynamic_attrs, $this::ID_PREFIX.'template');
// Add the submit button // Add the submit button
$this->addElement('button', $this::ID_PREFIX.'save', array( $this->addElement('button', $this::ID_PREFIX.'save', array(
'ignore' => true, 'ignore' => true,
'class' => 'btn '.$this::ID_PREFIX.'save', 'class' => 'btn '.$this::ID_PREFIX.'save',
'label' => _('Save'), 'label' => _('Save'),
'decorators' => array( 'decorators' => array(
'ViewHelper' 'ViewHelper'
) )
)); ));
// Add the cancel button // Add the cancel button
$this->addElement('button', $this::ID_PREFIX.'cancel', array( $this->addElement('button', $this::ID_PREFIX.'cancel', array(
'ignore' => true, 'ignore' => true,
'class' => 'btn '.$this::ID_PREFIX.'cancel', 'class' => 'btn '.$this::ID_PREFIX.'cancel',
'label' => _('Cancel'), 'label' => _('Cancel'),
'decorators' => array( 'decorators' => array(
'ViewHelper' 'ViewHelper'
) )
)); ));
} }

6
airtime_mvc/application/forms/EditHistoryFile.php
View File

@ -15,8 +15,8 @@ class Application_Form_EditHistoryFile extends Application_Form_EditHistory
); );
} }
public function createFromTemplate($template, $required) { public function createFromTemplate($template, $required) {
parent::createFromTemplate($template, $required); parent::createFromTemplate($template, $required);
} }
} }

40
airtime_mvc/application/services/HistoryService.php
View File

@ -525,22 +525,22 @@ class Application_Service_HistoryService
$md = $file->getDbColMetadata(); $md = $file->getDbColMetadata();
$prefix = Application_Form_EditHistoryFile::ID_PREFIX; $prefix = Application_Form_EditHistoryFile::ID_PREFIX;
$formValues = array(); $formValues = array();
$formValues["{$prefix}id"] = $id; $formValues["{$prefix}id"] = $id;
foreach($template["fields"] as $index => $field) { foreach($template["fields"] as $index => $field) {
$key = $field["name"]; $key = $field["name"];
if (in_array($key, $required)) { if (in_array($key, $required)) {
continue; continue;
} }
$value = $md[$key]; $value = $md[$key];
$formValues["$prefix{$key}"] = $value; $formValues["$prefix{$key}"] = $value;
} }
$form->populate($formValues); $form->populate($formValues);
return $form; return $form;
} }
@ -563,7 +563,7 @@ class Application_Service_HistoryService
$templateValues = $values[$prefix."template"]; $templateValues = $values[$prefix."template"];
$md = array(); $md = array();
foreach ($templateValues as $index => $value) { foreach ($templateValues as $index => $value) {
$key = substr($index, $prefix_len); $key = substr($index, $prefix_len);
@ -746,25 +746,25 @@ class Application_Service_HistoryService
try { try {
$id = $data["his_file_id"]; $id = $data["his_file_id"];
$form = $form = $this->makeHistoryFileForm($id); $form = $form = $this->makeHistoryFileForm($id);
$history_id = $form->getElement("his_file_id"); $history_id = $form->getElement("his_file_id");
$history_id->setRequired(true); $history_id->setRequired(true);
Logging::info($data); Logging::info($data);
$json = array(); $json = array();
if ($form->isValid($data)) { if ($form->isValid($data)) {
$history_id->setIgnore(true); $history_id->setIgnore(true);
$values = $form->getValues(); $values = $form->getValues();
Logging::info("edited list item"); Logging::info("edited list item");
Logging::info($values); Logging::info($values);
$this->populateTemplateFile($values, $id); $this->populateTemplateFile($values, $id);
} }
else { else {
$msgs = $form->getMessages(); $msgs = $form->getMessages();
Logging::info($msgs); Logging::info($msgs);
$json["error"] = $msgs; $json["error"] = $msgs;
} }