Merge remote-tracking branch 'upstream/hotfix-3.0.x' into scz

SURFscz · Jan 22, 2018 · 729fb63 · 729fb63
2 parents 32848c4 + e3c3569
commit 729fb63
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 8 deletions.
diff --git a/app/Model/CoProvisioningTarget.php b/app/Model/CoProvisioningTarget.php
@@ -112,8 +112,8 @@ public function beforeSave($options = array()) {
 
       $o = $this->find('first', $args);
 
-      if(!empty($o['m'])) {
-        $n = $o['m'] + 1;
+      if(!empty($o[0]['m'])) {
+        $n = $o[0]['m'] + 1;
       }
 
       $this->data['CoProvisioningTarget']['ordr'] = $n;

diff --git a/app/Plugin/GrouperProvisioner/Model/CoGrouperProvisionerTarget.php b/app/Plugin/GrouperProvisioner/Model/CoGrouperProvisionerTarget.php
@@ -486,6 +486,11 @@ public function provisionCoGroupDeleted($coProvisioningTargetData, $coGroup) {
 
   public function provisionCoGroupReprovisionRequested($coProvisioningTargetData, $coGroup) {
     $provisionerGroup = $this->CoGrouperProvisionerGroup->findProvisionerGroup($coProvisioningTargetData, $coGroup);
+
+    if(!isset($provisionerGroup)) {
+      $provisionerGroup = $this->CoGrouperProvisionerGroup->addProvisionerGroup($coProvisioningTargetData, $coGroup);
+    } 
+
     $groupName = $this->CoGrouperProvisionerGroup->getGrouperGroupName($provisionerGroup);
     $groupDescription = $this->CoGrouperProvisionerGroup->getGrouperGroupDescription($provisionerGroup);
     $groupDisplayExtension = $this->CoGrouperProvisionerGroup->getGroupDisplayExtension($provisionerGroup);

diff --git a/app/View/CoEnrollmentAttributes/fields.inc b/app/View/CoEnrollmentAttributes/fields.inc
@@ -522,7 +522,7 @@
               </select>
             <?php endif; ?>
           </div>
-          <div id="attr_def_val_date_div">
+          <div id="attr_def_val_date_div" class="modelbox-data">
             <?php if($e): ?>
               <input name="def_date_type"
                      id="def_date_fixed"

diff --git a/app/View/CoPersonRoles/fields.inc b/app/View/CoPersonRoles/fields.inc
@@ -419,7 +419,7 @@
                 ?>
               </div>
             </li>
-            <li>
+            <li class="modelbox-data">
               <div class="field-name">
                 <?php
                   if($e && !$es) {
@@ -455,7 +455,7 @@
                 ?>
               </div>
             </li>
-            <li>
+            <li class="modelbox-data">
               <div class="field-name">
                 <?php
                   if($e && !$es) {
@@ -501,7 +501,7 @@
               foreach($vv_extended_attributes as $c) {
                 $attr = strtolower($c['CoExtendedAttribute']['name']);
                 ?>
-                <li>
+                <li class="modelbox-data">
                   <div class="field-name">
                     <?php
                       if($e && !$es) {

diff --git a/app/View/OrgIdentities/fields.inc b/app/View/OrgIdentities/fields.inc
@@ -456,7 +456,7 @@
               ?>
             </div>
           </li>
-          <li>
+          <li class="modelbox-data">
             <div class="field-name">
               <?php
                 if($e) {
@@ -496,7 +496,7 @@
               ?>
             </div>
           </li>
-          <li>
+          <li class="modelbox-data">
             <div class="field-name">
               <?php
                 if($e) {

diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
@@ -1436,6 +1436,10 @@ ul.form-list select {
 ul.form-list li.fields-submit .required {
   font-style: italic;
 }
+ul.form-list li.modelbox-data #ui-datepicker-div {
+  position: relative !important; /* a fix for datepickers appended to fields in the form-list */
+  margin: 0 0 0 9px;
+}
 ul.field-children {
   margin: 0.5em;
   padding: 0;