summaryrefslogtreecommitdiffstats
path: root/src/usr
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2016-03-14 17:02:31 -0400
committerStephen Beaver <sbeaver@netgate.com>2016-03-14 17:08:47 -0400
commit533bce6f753a673cced9acc96d982bd24557fd68 (patch)
treef27dca46a572c9e543375e0647bcba3a0777cdc3 /src/usr
parent2ae79c2000714f9ab71eef7b8daf1de1f08e649f (diff)
downloadpfsense-533bce6f753a673cced9acc96d982bd24557fd68.zip
pfsense-533bce6f753a673cced9acc96d982bd24557fd68.tar.gz
Revert "Fixed #5983"
This reverts commit 9ec9978267a5d1985d6da8ba35d52b7174239d2f.
Diffstat (limited to 'src/usr')
-rw-r--r--src/usr/local/www/firewall_rules.php26
-rw-r--r--src/usr/local/www/jquery/pfSenseHelpers.js8
2 files changed, 2 insertions, 32 deletions
diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php
index 2d16205..cd05fbf 100644
--- a/src/usr/local/www/firewall_rules.php
+++ b/src/usr/local/www/firewall_rules.php
@@ -789,7 +789,6 @@ foreach ($a_filter as $filteri => $filterent):
</td>
<td class="action-icons">
<!-- <?=(isset($filterent['disabled']) ? 'enable' : 'disable')?> -->
- <a class="fa fa-anchor icon-pointer" id="Xmove_<?=$filteri?>" title="<?=gettext("Move checked rules above this one")?>"></a>
<a href="firewall_rules_edit.php?id=<?=$filteri;?>" class="fa fa-pencil" title="<?=gettext('Edit')?>"></a>
<a href="firewall_rules_edit.php?dup=<?=$filteri;?>" class="fa fa-clone" title="<?=gettext('Copy')?>"></a>
<?php if (isset($filterent['disabled'])) {
@@ -901,30 +900,6 @@ configsection = "filter";
events.push(function() {
- // "Move to here" (anchor) action
- $('[id^=Xmove_]').click(function (event) {
-
- event.stopImmediatePropagation();
-
- var anchor_row = $(this).parents("tr:first");
-
- $('#ruletable > tbody > tr').each(function() {
- ruleid = this.id.slice(2);
-
- if (ruleid && !isNaN(ruleid)) {
- if ($('#frc' + ruleid).prop('checked')) {
- $(this).insertBefore(anchor_row);
- fr_toggle(ruleid, "fr");
- }
- }
- });
-
- $('#order-store').removeAttr('disabled');
- reindex_rules($(anchor_row).parent('tbody'));
- dirty = true;
-
- });
-
// Make rules sortable. Hiding the table before applying sortable, then showing it again is
// a work-around for very slow sorting on FireFox
$('table tbody.user-entries').hide();
@@ -959,6 +934,7 @@ events.push(function() {
return undefined;
}
});
+
});
//]]>
</script>
diff --git a/src/usr/local/www/jquery/pfSenseHelpers.js b/src/usr/local/www/jquery/pfSenseHelpers.js
index 9e90e5d..70151ca 100644
--- a/src/usr/local/www/jquery/pfSenseHelpers.js
+++ b/src/usr/local/www/jquery/pfSenseHelpers.js
@@ -579,15 +579,9 @@ $('.container .panel-heading a[data-toggle="collapse"]').each(function (idx, el)
section.find('tr').each(function() {
if(this.id) {
$(this).attr("id", "fr" + row);
- $(this).attr("onclick", "fr_toggle(" + row + ")")
- $(this).find('input:checkbox:first').each(function() {
- $(this).attr("id", "frc" + row);
- $(this).attr("onclick", "fr_toggle(" + row + ")");
- });
-
row++;
}
- });
+ })
}
function handle_colors() {
OpenPOWER on IntegriCloud