Skip to content

fix #10: Не показывать пустое значение обязательным полям #11

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
sukhikh18 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix #10: Не показывать пустое значение обязательным полям #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions src/main/WeekDayType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,19 @@ public static function getFilterHTML($userField, $htmlControl)
* @return string
*
*/
protected static function getSelectHTML($name, $current = null, $multiple = false)
protected static function getSelectHTML($name, $current = null, $multiple = false, $mandatory = false)
{
if (empty(static::$days)) {
for ($i = WeekDayISO8601::MONDAY; $i <= WeekDayISO8601::SUNDAY; $i++) {
static::$days[$i] = static::getDay($i);
}
}
$return = '<select name="' . $name . '" ' . ($multiple ? 'multiple' : '') . '>';
$return .= '<option></option>';

if (!$multiple && !$mandatory) {
$return .= '<option>(Не выбрано)</option>';
}

foreach (static::$days as $i => $day) {
$selected = false;
if (null !== $current) {
Expand Down Expand Up @@ -188,7 +192,8 @@ public static function getEditFormHTML($userField, $htmlControl)
if ($userField['VALUE_ID'] < 1 && !empty($userField['SETTINGS']['DEFAULT_VALUE'])) {
$htmlControl['VALUE'] = $userField['SETTINGS']['DEFAULT_VALUE'];
}
$return = self::getSelectHTML($userField['FIELD_NAME'], $htmlControl['VALUE']);
$return = self::getSelectHTML($userField['FIELD_NAME'], $htmlControl['VALUE'], false,
'Y' === $userField['MANDATORY']);
} elseif (!empty($htmlControl['VALUE'])) {
$return = static::getAdminListViewHTML($userField, $htmlControl);
}
Expand Down Expand Up @@ -239,7 +244,9 @@ public static function getEditFormHTMLMulty($userField, $htmlControl)
$return = '&nbsp;';
if ($userField['EDIT_IN_LIST'] === 'Y') {
$return = '<table id="table_' . $userField['FIELD_NAME'] . '">
<tr><td>' . self::getSelectHTML($htmlControl['NAME'], $htmlControl['VALUE'], true) . '</td></tr>
<tr><td>' .
self::getSelectHTML($htmlControl['NAME'], $htmlControl['VALUE'], true, 'Y' === $userField['MANDATORY']) .
'</td></tr>
</table>';
} elseif (!empty($htmlControl['VALUE'])) {
$return = static::getAdminListViewHTMLMulty($userField, $htmlControl);
Expand Down