BUG10993: fix errormessage when editing static routes
Message ID | 1449495391-14881-1-git-send-email-alexander.marx@ipfire.org |
---|---|
State | Accepted |
Commit | 1e656e8adccae48639e3ce66a50b85017cadf75b |
Headers |
Return-Path: <development-bounces@lists.ipfire.org> Received: from mail01.ipfire.org (mail01.tremer.info [172.28.1.200]) by septima.ipfire.org (Postfix) with ESMTP id 8DAD26038E for <patchwork@ipfire.org>; Mon, 7 Dec 2015 14:36:44 +0100 (CET) Received: from hedwig.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 4A54FD4C; Mon, 7 Dec 2015 14:36:44 +0100 (CET) Received: from EDV.kappeln2011.lan (ip1f11b49c.dynamic.kabel-deutschland.de [31.17.180.156]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id DCFF6B89; Mon, 7 Dec 2015 14:36:40 +0100 (CET) From: Alexander Marx <alexander.marx@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH] BUG10993: fix errormessage when editing static routes Date: Mon, 7 Dec 2015 14:36:31 +0100 Message-Id: <1449495391-14881-1-git-send-email-alexander.marx@ipfire.org> X-Mailer: git-send-email 1.9.1 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <http://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <http://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
Message
Alexander Marx
Dec. 8, 2015, 12:36 a.m. UTC
When editing existing static routes and clicking on apply button, there
was an errormessage saying that this route is already in use.
Now the errormessage is only displayed if a new route has the same ip
than an existing one.
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
---
html/cgi-bin/routing.cgi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
Thank you. Merged. Will probably ship with Core Update 96. -Michael On Mon, 2015-12-07 at 14:36 +0100, Alexander Marx wrote: > When editing existing static routes and clicking on apply button, > there > was an errormessage saying that this route is already in use. > Now the errormessage is only displayed if a new route has the same ip > than an existing one. > > Signed-off-by: Alexander Marx <alexander.marx@ipfire.org> > --- > html/cgi-bin/routing.cgi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi > index 7636d1e..15989bd 100644 > --- a/html/cgi-bin/routing.cgi > +++ b/html/cgi-bin/routing.cgi > @@ -149,7 +149,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) { > $temp[2] ='' unless defined $temp[2]; # not always > populated > $temp[3] ='' unless defined $temp[2]; # not always > populated > #Same ip already used? > - if($temp[1] eq $settings{'IP'}){ > + if($temp[1] eq $settings{'IP'} && $settings{'KEY1'} > eq ''){ > $errormessage = $Lang::tr{'ccd err > irouteexist'}; > last; > }