change: 「メール通知機能を使う」がOffでも回答の「メール配信設定」を変更できるようにした Refs researchmap/Rm…

…NetCommons3#2138

Controller/QuestionnaireEditController.php

@@ -506,16 +506,6 @@ private function __setupViewParameters($questionnaire, $backUrl) {
 			? $questionnaire['Questionnaire']['key']
 			: null);
 
-		$isMailSetting = $this->MailSetting->getMailSetting(
-			array(
-				'plugin_key' => 'questionnaires',
-				'block_key' => Current::read('Block.key')
-			)
-		);
-		$this->set('isMailSetting', isset($isMailSetting['MailSetting']['is_mail_send'])
-			? $isMailSetting['MailSetting']['is_mail_send']
-			: null);
-
 		$this->request->data = $questionnaire;
 		$this->request->data['Frame'] = Current::read('Frame');
 		$this->request->data['Block'] = Current::read('Block');

View/QuestionnaireEdit/edit.ctp

@@ -129,16 +129,10 @@ $jsQuestionnaire = NetCommonsAppController::camelizeKeyRecursive(QuestionnairesA
 
 			<div class="form-group">
 				<?php echo $this->NetCommonsForm->label('', __d('questionnaires', 'Questionnaire method')); ?>
-				<?php if ($isMailSetting): ?>
 				<?php
 					echo $this->QuestionEdit->questionnaireAttributeCheckbox('is_answer_mail_send',
 					__d('questionnaires', 'Deliver e-mail when submitted'));
 				?>
-				<?php else: ?>
-				<div class="alert alert-warning">
-					<?php echo __d('questionnaires', 'E-mail notifications are disabled'); ?>
-				</div>
-				<?php endif; ?>
 				<?php if (Current::read('Room.space_id') == Space::PUBLIC_SPACE_ID): ?>
 				<?php echo $this->element('Questionnaires.QuestionnaireEdit/Edit/method_in_public'); ?>
 				<?php else: ?>