# HG changeset patch # User bsw # Date 1326135828 -3600 # Node ID 7b5b2449d2d5d663c43aea0849a932a96c32f4a6 # Parent 910bbf6bc6b1888494a5bfeb67aaf70ef7c5d8f4 Make member identification field work properly. diff -r 910bbf6bc6b1 -r 7b5b2449d2d5 app/main/admin/_action/member_update.lua --- a/app/main/admin/_action/member_update.lua Tue Dec 27 03:34:35 2011 +0100 +++ b/app/main/admin/_action/member_update.lua Mon Jan 09 20:03:48 2012 +0100 @@ -1,6 +1,6 @@ local member = Member:by_id(param.get_id()) or Member:new() -param.update(member, "login", "admin", "name", "active") +param.update(member, "identification", "login", "admin", "name", "active") local password = param.get("password") if password == "********" or #password == 0 then diff -r 910bbf6bc6b1 -r 7b5b2449d2d5 app/main/admin/member_edit.lua --- a/app/main/admin/member_edit.lua Tue Dec 27 03:34:35 2011 +0100 +++ b/app/main/admin/member_edit.lua Mon Jan 09 20:03:48 2012 +0100 @@ -23,11 +23,12 @@ } }, content = function() - ui.field.text{ label = _"Login", name = "login" } - ui.field.text{ label = _"Name", name = "name" } - ui.field.password{ label = _"Password", name = "password", value = (member and member.password) and "********" or "" } - ui.field.boolean{ label = _"Admin?", name = "admin" } - ui.field.boolean{ label = _"Active?", name = "active" } + ui.field.text{ label = _"Identification", name = "identification" } + ui.field.text{ label = _"Login", name = "login" } + ui.field.text{ label = _"Name", name = "name" } + ui.field.password{ label = _"Password", name = "password", value = (member and member.password) and "********" or "" } + ui.field.boolean{ label = _"Active?", name = "active" } + ui.field.boolean{ label = _"Admin?", name = "admin" } ui.submit{ text = _"Save" } end } diff -r 910bbf6bc6b1 -r 7b5b2449d2d5 app/main/admin/member_list.lua --- a/app/main/admin/member_list.lua Tue Dec 27 03:34:35 2011 +0100 +++ b/app/main/admin/member_list.lua Mon Jan 09 20:03:48 2012 +0100 @@ -58,8 +58,8 @@ end }, { - label = _"Ident number", - name = "ident_number" + label = _"Identification", + name = "identification" }, { label = _"Admin?", diff -r 910bbf6bc6b1 -r 7b5b2449d2d5 app/main/member/_profile.lua --- a/app/main/member/_profile.lua Tue Dec 27 03:34:35 2011 +0100 +++ b/app/main/member/_profile.lua Mon Jan 09 20:03:48 2012 +0100 @@ -42,8 +42,8 @@ if member.locked then ui.field.boolean{ label = _"Locked?", name = "locked" } end - if member.ident_number then - ui.field.text{ label = _"Ident number", name = "ident_number" } + if member.identification then + ui.field.text{ label = _"Identification", name = "identification" } end ui.field.text{ label = _"Name", name = "name" }