Skip to content

Better default value handling #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
sahanh wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Better default value handling #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb8060d
Better default value handling
Oct 11, 2013
6d0e636
Disable object conversion of default values
Oct 11, 2013
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
17 changes: 11 additions & 6 deletions src/Jonob/Formly/Formly.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,11 @@ private function loadConfig()
*/
public function setDefaults($defaults = array())
{
$defaults = json_decode(json_encode($defaults), true);

if (count($defaults) > 0)
{
$this->defaults = (object)$defaults;
$this->defaults = $defaults;
}

return $this;
Expand Down Expand Up @@ -488,7 +490,10 @@ private function buildLabel($name, $label = '')
private function calculateValue($name, $default = '', $radioValue = '')
{
$result = '';


//make array named fields to dot notation
$field_name = str_replace(array('[', ']'), array('.', ''), $name);

// First check if there is post data
// This assumes that you are redirecting after failed post
// and that you have flashed the data
Expand All @@ -508,11 +513,11 @@ private function calculateValue($name, $default = '', $radioValue = '')
}

// lastly, check if any defaults have been set for the form as a whole
elseif (isset($this->defaults->$name))
elseif ($value = array_get($this->defaults, $field_name))
{
$result = ($radioValue)
? $this->defaults->$name == $radioValue
: $this->defaults->$name;
? $value == $radioValue
: $value;
}

return $result;
Expand Down Expand Up @@ -695,4 +700,4 @@ public function close()
{
return Form::close();
}
}
}