[spalenque] - #14291 * fix affiliation form field

OpenStackweb · Aug 24, 2018 · def512f · def512f
1 parent 9f1061f
commit def512f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/registration/code/ui/AffiliationController.php b/registration/code/ui/AffiliationController.php
@@ -115,9 +115,8 @@ public function GetAffiliation($request)
     {
         $params = $request->allParams();
 
-        if ($CurrentMember = Member::currentUser() && isset($params["ID"]) && is_int($params["ID"])) {
-            $affilliation_id = $params["ID"];
-            $affilliation_id = Convert::raw2sql($affilliation_id);
+        if ($CurrentMember = Member::currentUser() && isset($params["ID"]) && is_numeric($params["ID"])) {
+            $affilliation_id = Convert::raw2sql($params["ID"]);
 
             $results = DB::query("SELECT A.ID,A.StartDate,A.EndDate,A.JobTitle,A.Role,A.Current,O.Name AS OrgName
                                   FROM Affiliation A
@@ -138,6 +137,7 @@ public function GetAffiliation($request)
                 exit();
             }
         }
+
         echo json_encode('ERROR');
     }
 

diff --git a/registration/code/ui/forms/AffiliationField.php b/registration/code/ui/forms/AffiliationField.php
@@ -31,6 +31,7 @@ public function setMode($mode)
 
     public function FieldHolder($attributes = array ()) {
         Requirements::css(THIRDPARTY_DIR . '/jquery-ui-themes/smoothness/jquery-ui.css');
+        Requirements::css('node_modules/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css');
         Requirements::javascript(THIRDPARTY_DIR . '/jquery-ui/jquery-ui.js');
         Requirements::css("registration/css/affiliations.css");
         JSChosenDependencies::renderRequirements();

diff --git a/registration/templates/forms/AffiliationModalForm.ss b/registration/templates/forms/AffiliationModalForm.ss
@@ -20,9 +20,8 @@
                         <input type="text" class="form-control" id="EndDate" name="EndDate" placeholder="End Date">
                     </div>
                     <div class="checkbox">
-                        <label>
-                            <input type="checkbox" id="Current" name="Current"> Is Current?
-                        </label>
+                        <input type="checkbox" id="Current" name="Current">
+                        <label for="Current"> Is Current? </label>
                     </div>
                     <input type="hidden" id="Id" name="Id" value="0"/>
                 </form>