Skip to content

Commit def512f

Browse files
committed
[spalenque] - #14291 * fix affiliation form field
1 parent 9f1061f commit def512f

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

registration/code/ui/AffiliationController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,8 @@ public function GetAffiliation($request)
115115
{
116116
$params = $request->allParams();
117117

118-
if ($CurrentMember = Member::currentUser() && isset($params["ID"]) && is_int($params["ID"])) {
119-
$affilliation_id = $params["ID"];
120-
$affilliation_id = Convert::raw2sql($affilliation_id);
118+
if ($CurrentMember = Member::currentUser() && isset($params["ID"]) && is_numeric($params["ID"])) {
119+
$affilliation_id = Convert::raw2sql($params["ID"]);
121120

122121
$results = DB::query("SELECT A.ID,A.StartDate,A.EndDate,A.JobTitle,A.Role,A.Current,O.Name AS OrgName
123122
FROM Affiliation A
@@ -138,6 +137,7 @@ public function GetAffiliation($request)
138137
exit();
139138
}
140139
}
140+
141141
echo json_encode('ERROR');
142142
}
143143

registration/code/ui/forms/AffiliationField.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public function setMode($mode)
3131

3232
public function FieldHolder($attributes = array ()) {
3333
Requirements::css(THIRDPARTY_DIR . '/jquery-ui-themes/smoothness/jquery-ui.css');
34+
Requirements::css('node_modules/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css');
3435
Requirements::javascript(THIRDPARTY_DIR . '/jquery-ui/jquery-ui.js');
3536
Requirements::css("registration/css/affiliations.css");
3637
JSChosenDependencies::renderRequirements();

registration/templates/forms/AffiliationModalForm.ss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@
2020
<input type="text" class="form-control" id="EndDate" name="EndDate" placeholder="End Date">
2121
</div>
2222
<div class="checkbox">
23-
<label>
24-
<input type="checkbox" id="Current" name="Current"> Is Current?
25-
</label>
23+
<input type="checkbox" id="Current" name="Current">
24+
<label for="Current"> Is Current? </label>
2625
</div>
2726
<input type="hidden" id="Id" name="Id" value="0"/>
2827
</form>

0 commit comments

Comments
 (0)