Skip to content

(fixed #4124, BP from #1640) 通知メールの受け取り可否設定を必須項目とするよう変更 #31

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
nishizoe wants to merge 1 commit into
base: stable-1.0.x
Choose a base branch
from
Open

(fixed #4124, BP from #1640) 通知メールの受け取り可否設定を必須項目とするよう変更 #31

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion apps/pc_frontend/modules/communityTopic/templates/_configNotificationMail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php if (version_compare(OPENPNE_VERSION, '3.6beta1-dev', '>=') && $form): ?>
<?php op_include_form('configNotificationMailBox', $form, array(
'mark_required_field' => false,
'mark_required_field' => true,
'url' => url_for('@config_community_topic_notification_mail?id='.$sf_request->getParameter('id')),
'button' => __('Save'),
)); ?>
Expand Down
4 changes: 2 additions & 2 deletions lib/form/opConfigCommunityTopicNotificationMailForm.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function configure()
)));
$this->setValidator('to_pc_address', new sfValidatorChoice(array(
'choices' => array_keys($this->choices),
'required' => false,
'required' => true,
)));

$this->setWidget('to_mobile_address', new sfWidgetFormSelectRadio(array(
Expand All @@ -57,7 +57,7 @@ public function configure()
)));
$this->setValidator('to_mobile_address', new sfValidatorChoice(array(
'choices' => array_keys($this->choices),
'required' => false,
'required' => true,
)));

$this->widgetSchema->setNameFormat('topic_notify[%s]');
Expand Down