Merge branch 'fronkdev' into 'master'

Added banned FCPs to preordercampaign

See merge request fronk/thetool!105

Layout/default/Preordercampaign/Form.php

@@ -145,6 +145,17 @@
                     </div>
                   </div>
                   
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="banned_rimo_fcp">Für Bestellung gesperrte FCPs</label>
+                    <div class="col-lg-10">
+                      <select class="select2 form-control select2-multiple bg-danger" name="banned_rimo_fcp[]" id="banned_rimo_fcp" multiple="multiple" data-placeholder="FCPs ...">
+                        <?php foreach($campaign->all_fcp_names as $fcp_name): ?>
+                          <option value="<?=$fcp_name?>" <?=(is_array($campaign->banned_fcps) && in_array($fcp_name, $campaign->banned_fcps)) ? "selected='selected'" : ""?>><?=$fcp_name?></option>
+                        <?php endforeach; ?>
+                      </select>
+                    </div>
+                  </div>
+                  
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="adb_netzgebiet_ids">Erforderliche Zusatzfelder:</label>
                     <div class="col-lg-10">
@@ -283,5 +294,11 @@
     placeholder: "",
     closeOnSelect: false
   });
+  $("#banned_rimo_fcp").select2({
+    allowClear: true,
+    placeholder: "",
+    closeOnSelect: false,
+    background: "bg-danger"
+  });
 </script>
 <?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>

Layout/default/header.php

@@ -22,7 +22,7 @@
         <link href="<?=self::getResourcePath()?>datatables/datatables.min.css" rel="stylesheet" type="text/css" />
         
         <script type="text/javascript" src="<?=self::getResourcePath()?>js/jquery.min.js"></script>
-        <script type="text/javascript" src="<?=self::getResourcePath()?>assets/libs/select2/select2.min.js"></script>
+        <script type="text/javascript" src="<?=self::getResourcePath()?>assets/libs/select2/select2.full.min.js"></script>
         <script type="text/javascript" src="<?=self::getResourcePath()?>js/bootstrap-datepicker.min.js"></script>
         <script type="text/javascript" src="<?=self::getResourcePath()?>js/bootstrap-datepicker.de.min.js"></script>
         <script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/geo/geo.js"></script>