zydronium/getnamingo-registry
1
0
Fork 0
mirror of https://github.com/getnamingo/registry.git synced 2025-05-15 09:07:00 +02:00
Code Issues Projects Releases Packages Wiki Activity

Small UI fixes

Browse source
This commit is contained in:
Pinga 2023-12-18 21:09:29 +02:00
parent 283de11c85
commit 7ecc347cc4
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cp/app/Controllers/SystemController.php
View file

@ -1027,11 +1027,13 @@ class SystemController extends Controller
return $response->withHeader('Location', '/registry/tld/'.$sData['extension'])->withStatus(302); return $response->withHeader('Location', '/registry/tld/'.$sData['extension'])->withStatus(302);
} }
// Check for existing phase_type or date overlap // Check for existing phase_type (excluding 'Custom' with different phase_name) or date overlap (excluding 'Custom' and 'Open' types)
$query = "SELECT $query = "SELECT
(SELECT COUNT(*) FROM launch_phases WHERE tld_id = ? AND phase_type = ?) as phaseTypeExists, (SELECT COUNT(*) FROM launch_phases
WHERE tld_id = ? AND phase_type = ? AND (phase_type <> 'Custom' OR (phase_type = 'Custom' AND phase_name = ?))) as phaseTypeExists,
(SELECT COUNT(*) FROM launch_phases (SELECT COUNT(*) FROM launch_phases
WHERE tld_id = ? AND WHERE tld_id = ? AND
phase_type NOT IN ('Custom', 'Open') AND
((start_date <= ? AND end_date >= ?) OR ((start_date <= ? AND end_date >= ?) OR
(start_date <= ? AND end_date >= ?) OR (start_date <= ? AND end_date >= ?) OR
(start_date >= ? AND end_date <= ?))) as dateOverlapExists"; (start_date >= ? AND end_date <= ?))) as dateOverlapExists";
@ -1039,7 +1041,7 @@ class SystemController extends Controller
$result = $db->selectRow( $result = $db->selectRow(
$query, $query,
[ [
$sData['tldid'], $sData['phaseType'], $sData['tldid'], $sData['phaseType'], $sData['phaseName'],
$sData['tldid'], $sData['phaseEnd'], $sData['phaseStart'], $sData['tldid'], $sData['phaseEnd'], $sData['phaseStart'],
$sData['phaseStart'], $sData['phaseEnd'], $sData['phaseStart'], $sData['phaseEnd'],
$sData['phaseStart'], $sData['phaseEnd'] $sData['phaseStart'], $sData['phaseEnd']

2
cp/resources/views/admin/system/manageTld.twig
View file

@ -239,6 +239,7 @@
<div class="mb-3"> <div class="mb-3">
<label for="promotionStart" class="form-label required">Promotion Start Date</label> <label for="promotionStart" class="form-label required">Promotion Start Date</label>
<input type="datetime-local" class="form-control" placeholder="e.g., 01/01/2023" id="promotionStart" name="promotionStart" required> <input type="datetime-local" class="form-control" placeholder="e.g., 01/01/2023" id="promotionStart" name="promotionStart" required>
<small class="form-text text-muted"><strong>Please Note:</strong> All times displayed are in <strong>Coordinated Universal Time (UTC)</strong></small>
</div> </div>
</div> </div>
<div class="col-sm-6 col-md-6"> <div class="col-sm-6 col-md-6">
@ -344,6 +345,7 @@
<div class="mb-3"> <div class="mb-3">
<label for="phaseStart" class="form-label required">Phase Start Date</label> <label for="phaseStart" class="form-label required">Phase Start Date</label>
<input type="datetime-local" class="form-control" placeholder="e.g., 01/01/2023" id="phaseStart" name="phaseStart" required> <input type="datetime-local" class="form-control" placeholder="e.g., 01/01/2023" id="phaseStart" name="phaseStart" required>
<small class="form-text text-muted"><strong>Please Note:</strong> All times displayed are in <strong>Coordinated Universal Time (UTC)</strong></small>
</div> </div>
</div> </div>
<div class="col-sm-6 col-md-6"> <div class="col-sm-6 col-md-6">