[TASk] feedback from review - filters, ui, blacklist

Classes/Domain/Repository/MailRepository.php

@@ -36,7 +36,6 @@ use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
 class MailRepository extends AbstractRepository {
 	const SENT = '1';
 	const NOT_SENT = '2';
-	const BLACKLISTED = '3';
 
 	/**
 	 * Returns all mails that are still not sent ordered by priority.
@@ -152,22 +151,19 @@ class MailRepository extends AbstractRepository {
 			$constraintsAnd[] = $query->lessThanOrEqual('last_sending_time', $toTime);
 		}
 
+		if ((int) $filters['filterBlacklist'] !== 1) {
+			$constraintsAnd[] = $query->equals('blacklisted', 0);
+		}
+
 		if ($filters['filterSent']) {
 			switch ($filters['filterSent']) {
 				case self::SENT:
 					$constraintsAnd[] = $query->greaterThan('last_sending_time', 0);
-					$constraintsAnd[] = $query->equals('blacklisted', 0);
-					break;
-				case self::BLACKLISTED:
-					$constraintsAnd[] = $query->equals('blacklisted', 1);
 					break;
 				case self::NOT_SENT:
 					$constraintsAnd[] = $query->equals('last_sending_time', 0);
-					$constraintsAnd[] = $query->equals('blacklisted', 0);
 					break;
 			}
-		} else {
-			$constraintsAnd[] = $query->equals('blacklisted', 0);
 		}
 
 		$constraintsAnd[] = $query->equals('pid', (int) $pid);

Resources/Private/Partials/Queue/Filter.html

@@ -111,23 +111,23 @@
 					<f:form.radio property="filterSent" id="filters-notsent" value="2" checked="{f:if(condition: '{filters.filterSent} == \'2\'', then: '1')}" />
 					<f:translate key="backend.not_sent" />
 				</label>
-				<label class="radio-inline">
-					<f:form.radio property="filterSent" id="filters-blacklisted" value="3" checked="{f:if(condition: '{filters.filterSent} == \'3\'', then: '1')}" />
-					<f:translate key="backend.blacklisted" />
-				</label>
 			</div>
-			<div class="form-group row">
-				<div class="col-md-12">
-					<f:form.button class="filter-btn btn btn-success form-group col-xs-12 col-md-12" type="submit">
-						<f:translate key="backend.filter.filter" />
-					</f:form.button>
-					<f:form.button class="filter-btn btn btn-info form-group col-xs-12 col-md-12" type="submit" name="action" value="export">
-						<f:translate key="backend.button_download_csv" />
-					</f:form.button>
-					<f:form.button id="filter-reset-btn" class="filter-btn btn btn-danger form-group col-xs-12 col-md-12" type="reset">
-						<f:translate key="backend.button_reset_filter" />
-					</f:form.button>
-				</div>
+			<div class="form-group">
+				<f:form.checkbox property="filterBlacklist" id="filters-blacklisted" value="1" checked="{f:if(condition: '{filters.filterBlacklist} == \'1\'', then: '1')}" />
+				<f:translate key="backend.blacklisted" />
+			</div>
+		</div>
+		<div class="form-group">
+			<div class="col-md-12">
+				<f:form.button class="filter-btn btn btn-success form-group col-xs-12 col-md-12" type="submit">
+					<f:translate key="backend.filter.filter" />
+				</f:form.button>
+				<f:form.button class="filter-btn btn btn-info form-group col-xs-12 col-md-12" type="submit" name="action" value="export">
+					<f:translate key="backend.button_download_csv" />
+				</f:form.button>
+				<f:form.button id="filter-reset-btn" class="filter-btn btn btn-danger form-group col-xs-12 col-md-12" type="reset">
+					<f:translate key="backend.button_reset_filter" />
+				</f:form.button>
 			</div>
 		</div>
 	</div>

Resources/Private/Templates/Mail/Index.html

@@ -9,10 +9,10 @@
 	<f:if condition="{selectedTemplate}">
 		<f:then>
 			<div class="row form-group col-md-12">
-				<div class=" col-md-10">
+				<div class=" col-md-9">
 					<p>{templateDescription}</p>
 				</div>
-				<div class=" col-md-2">
+				<div class=" col-md-3">
 					<f:link.action class="reset-btn reset-all-btn btn-danger btn col-md-12"  action="reset" arguments="{template: selectedTemplateKey, extensionKey: selectedTemplate.extension}">{f:translate(key:'backend.button_reset_all')}</f:link.action>
 				</div>
 			</div>