Merge remote-tracking branch 'jaapmarcus/fix/bulk-actions' into feature/user-roles

Author: Kristan Kenney

web/js/init.js

@@ -133,6 +133,23 @@ $(document).ready(function(){
                   document.getElementById('default-sort').click();
                   $('.context-menu.sort-order').toggle();
               };
+              
+              $('#objects').submit( function (e){
+                 if(!e.originalEvent){
+                    return;
+                 }
+                 e.preventDefault();
+                 $('.ch-toggle').each( function (){
+                    if($(this).prop('checked')){
+                        key=this.name;
+                        div=$('<input type="hidden" name="'+key+'[]" value="'+this.value+'"/>');
+                        $('#objects').append(div);
+                    }
+                 });
+                 
+                 $('#objects').submit();
+                 return true;
+              });
 
               // Shortcuts
 

web/templates/pages/list_backup.html

@@ -31,6 +31,7 @@
                     </select>
                   </div>
                   <button type="submit" class="l-sort-toolbar__filter-apply" value="" title="<?=_('apply to selected')?>"><i class="fas fa-arrow-right"></i></button>
+                  <form>
                 </td>
               <? } ?>
             </tr>

web/templates/pages/list_backup_detail.html

@@ -25,6 +25,7 @@
                   </select>
                 </div>
                 <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
+                <form>
               </td>
             </tr>
           </table>

web/templates/pages/list_cron.html

@@ -51,6 +51,7 @@
                     </select>
                   </div>
                   <button type="submit" class="l-sort-toolbar__filter-apply" value="" title="<?=_('apply to selected')?>"><i class="fas fa-arrow-right"></i></button>
+                  </form>
                 </td>
               <? } ?>
             </tr>

web/templates/pages/list_db.html

@@ -71,6 +71,7 @@
                     </select>
                   </div>
                   <button type="submit" class="l-sort-toolbar__filter-apply" value="" title="<?=_('apply to selected')?>"><i class="fas fa-arrow-right"></i></button>
+                  </form>
                 </td>
               <? } ?>
             </tr>

web/templates/pages/list_dns.html

@@ -50,6 +50,7 @@
                     </select>
                   </div>
                   <button type="submit" class="l-sort-toolbar__filter-apply" value="" title="<?=_('apply to selected')?>"><i class="fas fa-arrow-right"></i></button>
+                  </form>
                 </td>
               <? } ?>
             </tr>

web/templates/pages/list_dns_rec.html

@@ -50,6 +50,7 @@
                     </select>
                   </div>
                   <button type="submit" class="l-sort-toolbar__filter-apply" value="" title="<?=_('apply to selected')?>"><i class="fas fa-arrow-right"></i></button>
+                  </form>
                 </td>
               <? } ?>
             </tr>

web/templates/pages/list_firewall.html

@@ -31,6 +31,7 @@
                   </select>
                 </div>
                 <button type="submit" class="l-sort-toolbar__filter-apply" value="" title="<?=_('apply to selected')?>"><i class="fas fa-arrow-right"></i></button>
+                </form>
               </td>
             </tr>
           </table>

web/templates/pages/list_firewall_banlist.html

@@ -17,6 +17,7 @@
                   </select>
                 </div>
                 <button type="submit" class="l-sort-toolbar__filter-apply" value="" title="<?=_('apply to selected')?>"><i class="fas fa-arrow-right"></i></button>
+                </form>
               </td>
             </tr>
           </table>

web/templates/pages/list_firewall_ipset.html

@@ -17,6 +17,7 @@
                   </select>
                 </div>
                 <button type="submit" class="l-sort-toolbar__filter-apply" value="" title="<?=_('apply to selected')?>"><i class="fas fa-arrow-right"></i></button>
+                </form>
               </td>
             </tr>
           </table>