[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a421b8038b927529a4ed08c13539f74f66c18f9e

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a421b8038b927529a4ed08c13539f74f66c18f9e

[git]

[-- Attachment #1: Type: text/plain, Size: 2840 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  a421b8038b927529a4ed08c13539f74f66c18f9e (commit)
       via  91fc30309fcc929ae3b4b88f6cac67e1214e73a9 (commit)
      from  e97d4c98963477b5247005d33acd9d4b5fe1ca8e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a421b8038b927529a4ed08c13539f74f66c18f9e
Merge: 91fc303 e97d4c9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Jun 1 15:59:33 2015 +0200

    Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit 91fc30309fcc929ae3b4b88f6cac67e1214e73a9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Jun 1 15:56:46 2015 +0200

    dhcp: Enter edit mode after adding a static lease from list
    
    After a lease has been added from the list of leases it is often
    desirable to edit it right away. It appeared that the system
    was in edit mode after the lease has been added because the form
    had the values of the recently added lease, but hitting the
    "Add" button cause an error message that stated that this is
    a duplicate entry.
    
    This patch will switch to edit more where the user can change
    the values and hit "Update". If he or she chooses to ignore
    that the entry is still saved.

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/dhcp.cgi | 3 +++
 1 file changed, 3 insertions(+)

Difference in files:
diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
index e75207a..dd48d58 100644
--- a/html/cgi-bin/dhcp.cgi
+++ b/html/cgi-bin/dhcp.cgi
@@ -438,6 +438,9 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'add'}.'2') {
 	if ($dhcpsettings{'KEY2'} eq '') { #add or edit ?
 	    unshift (@current2, "$dhcpsettings{'FIX_MAC'},$dhcpsettings{'FIX_ADDR'},$dhcpsettings{'FIX_ENABLED'},$dhcpsettings{'FIX_NEXTADDR'},$dhcpsettings{'FIX_FILENAME'},$dhcpsettings{'FIX_ROOTPATH'},$dhcpsettings{'FIX_REMARK'}\n");
 	    &General::log($Lang::tr{'fixed ip lease added'});
+
+	    # Enter edit mode
+	    $dhcpsettings{'KEY2'} = $key;
 	} else {
 	    @current2[$dhcpsettings{'KEY2'}] = "$dhcpsettings{'FIX_MAC'},$dhcpsettings{'FIX_ADDR'},$dhcpsettings{'FIX_ENABLED'},$dhcpsettings{'FIX_NEXTADDR'},$dhcpsettings{'FIX_FILENAME'},$dhcpsettings{'FIX_ROOTPATH'},$dhcpsettings{'FIX_REMARK'}\n";
 	    $dhcpsettings{'KEY2'} = '';       # End edit mode


hooks/post-receive
--
IPFire 2.x development tree