Author: billyxie Date: 2009-10-23 09:27:54 +0200 (Fri, 23 Oct 2009) New Revision: 39294
Modified: CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security.properties CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security_nl.properties CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security_zh.properties CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/UserForm.java CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/UserInitAction.java Log: CMSC-1572 - Some little improvements on the Add a user screen Modified: CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security.properties =================================================================== --- CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security.properties 2009-10-22 14:24:23 UTC (rev 39293) +++ CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security.properties 2009-10-23 07:27:54 UTC (rev 39294) @@ -1,107 +1,109 @@ -role.legend.userrights=User Rights - -role.inherit=- -role.none=none -role.writer=writer -role.editor=editor -role.chiefeditor=chief editor -role.webmaster=webmaster - -changeprofile.title=My Profile -changeprofile.succeeded=My Profile information is updated successfully. -changeprofile.current=Old password -changeprofile.new=New password -changeprofile.confirm=Confirm password -changeprofile.submit=Save - -changelanguage.title=Change Language -changelanguage.succeeded=The language setting is updated successfully. -changelanguage.language=Language -changelanguage.default=The default (browser) language -changelanguage.english=English -changelanguage.dutch=Dutch -changelanguage.chinese=Chinese -changelanguage.french=French -changelanguage.submit=Save - -profile.title=Profile - -edit_defaults.channelselect=Select -edit_defaults.erase=Erase - -group.title=Group -group.name=Name -group.description=Description -group.simpleeditorchannel=Simple ed. channel: -group.members=Members -group.nonmembers=Users -group.submit=Save -group.cancel=Cancel - -user.title=User: {0} -user.edit.title=User -user.account=Account -user.name=Name -user.firstname=First name -user.prefix=Prefix -user.surname=Surname -user.email=Email -user.company=Company -user.department=Department -user.note=Note -user.password=Password -user.confirmpassword=Confirm password -user.emailsignal=Email notification -user.rank=Rank -user.rank.admin=Administrator -user.status=Status -user.status.active=Active -user.submit=Save -user.cancel=Cancel -user.info=Info - -userlist.title=User Management -userlist.groups=Groups -userlist.contentroles=Content Roles -userlist.siteroles=Site Roles -userlist.removegroup=Delete Group -userlist.removegroupquestion=Delete group? -userlist.newgroup=New Group -userlist.users=Users -userlist.removeuser=Delete User -userlist.removeuserquestion=Delete user? -userlist.newuser=New User -userlist.info=User Information - -contentroles.title=Roles -contentroles.description=When no role is selected for a channel then the role is used of the nearest ancestor channel. -contentroles.submit=Save -contentroles.cancel=Cancel - -siteroles.title=Roles -siteroles.description=When no role is selected for a page then the role is used of the nearest ancestor page. -siteroles.submit=Save -siteroles.cancel=Cancel - -rights.page.title=Page rights -rights.userson=Users with rights on the {0} {1} : -rights.groupson=Groups with rights on the {0} {1} : - -rights.content.title=Content rights - -error.password.incorrect=Password is incorrect. -error.password.invalid=Password has to be at least 6 and at most 15 characters long. -error.password.nomatch=New passwords are not the same. -error.newpassword.incorrect=New password can't be the same as the old password. - -error.username.invalid=Account has to be at least 3 and at most 15 characters long. -error.username.alreadyexists=Account already exists. -error.email.empty=E-mail should be filled in. -error.groupname.invalid=Account has to be at least 3 characters long. -error.groupname.alreadyexists=group already exists. - -showitem.close=Close this screen. -showitem.groups=The user is a member of the following group(s): - -user.notice=Items with a * are required! -user.textlength=Up to 40 characters \ No newline at end of file +role.legend.userrights=User Rights + +role.inherit=- +role.none=none +role.writer=writer +role.editor=editor +role.chiefeditor=chief editor +role.webmaster=webmaster + +changeprofile.title=My Profile +changeprofile.succeeded=My Profile information is updated successfully. +changeprofile.current=Old password +changeprofile.new=New password +changeprofile.confirm=Confirm password +changeprofile.submit=Save + +changelanguage.title=Change Language +changelanguage.succeeded=The language setting is updated successfully. +changelanguage.language=Language +changelanguage.default=The default (browser) language +changelanguage.english=English +changelanguage.dutch=Dutch +changelanguage.chinese=Chinese +changelanguage.french=French +changelanguage.submit=Save + +profile.title=Profile + +edit_defaults.channelselect=Select +edit_defaults.erase=Erase + +group.title=Group +group.name=Name +group.description=Description +group.simpleeditorchannel=Simple ed. channel: +group.members=Members +group.nonmembers=Users +group.submit=Save +group.cancel=Cancel + +user.title=User: {0} +user.edit.title=User +user.account=Account +user.name=Name +user.firstname=First name +user.prefix=Prefix +user.surname=Surname +user.email=Email +user.company=Company +user.department=Department +user.note=Note +user.password=Password +user.confirmpassword=Confirm password +user.emailsignal=Email notification +user.rank=Rank +user.rank.admin=Administrator +user.status=Status +user.status.active=Active +user.status.disabled=Disabled +user.submit=Save +user.cancel=Cancel +user.info=Info + +userlist.title=User Management +userlist.groups=Groups +userlist.contentroles=Content Roles +userlist.siteroles=Site Roles +userlist.removegroup=Delete Group +userlist.removegroupquestion=Delete group? +userlist.newgroup=New Group +userlist.users=Users +userlist.removeuser=Delete User +userlist.removeuserquestion=Delete user? +userlist.newuser=New User +userlist.info=User Information + +contentroles.title=Roles +contentroles.description=When no role is selected for a channel then the role is used of the nearest ancestor channel. +contentroles.submit=Save +contentroles.cancel=Cancel + +siteroles.title=Roles +siteroles.description=When no role is selected for a page then the role is used of the nearest ancestor page. +siteroles.submit=Save +siteroles.cancel=Cancel + +rights.page.title=Page rights +rights.userson=Users with rights on the {0} {1} : +rights.groupson=Groups with rights on the {0} {1} : + +rights.content.title=Content rights + +error.password.incorrect=Password is incorrect. +error.password.invalid=Password has to be at least 6 and at most 15 characters long. +error.password.nomatch=New passwords are not the same. +error.newpassword.incorrect=New password can't be the same as the old password. + +error.username.invalid=Account has to be at least 3 and at most 15 characters long. +error.username.alreadyexists=Account already exists. +error.email.empty=E-mail should be filled in. +error.groupname.invalid=Account has to be at least 3 characters long. +error.groupname.alreadyexists=group already exists. + +showitem.close=Close this screen. +showitem.groups=The user is a member of the following group(s): + +user.notice=Items with a * are required! +user.textlength=Up to 40 characters + Modified: CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security_nl.properties =================================================================== --- CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security_nl.properties 2009-10-22 14:24:23 UTC (rev 39293) +++ CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security_nl.properties 2009-10-23 07:27:54 UTC (rev 39294) @@ -1,107 +1,108 @@ -role.legend.userrights=Gebruikers rechten - -role.inherit=- -role.none=geen -role.writer=schrijver -role.editor=redacteur -role.chiefeditor=eindredacteur -role.webmaster=webmaster - -changeprofile.title=Mijn Profiel -changeprofile.succeeded=Mijn Profiel informatie is succesvol gewijzigd. -changeprofile.current=Huidig wachtwoord -changeprofile.new=Nieuw wachtwoord -changeprofile.confirm=Bevestig nieuw wachtwoord -changeprofile.submit=Opslaan - -changelanguage.title=Taal aanpassen -changelanguage.succeeded=De taalinstelling is succesvol gewijzigd. -changelanguage.language=Taal -changelanguage.default=Automatisch (browser) -changelanguage.english=Engels -changelanguage.dutch=Nederlands -changelanguage.chinese=Chinees -changelanguage.french=Frans -changelanguage.submit=Opslaan - -profile.title=Profiel - -edit_defaults.channelselect=Selecteer -edit_defaults.erase=Wis - -group.title=Groep -group.name=Naam -group.description=Omschrijving -group.simpleeditorchannel=Simple Editors rubriek -group.members=Leden -group.nonmembers=Gebruikers -group.submit=Opslaan -group.cancel=Annuleren - -user.title=Gebruiker: {0} -user.edit.title=Gebruiker -user.account=Account -user.name=Naam -user.firstname=Voornaam -user.prefix=Tussenvoegsels -user.surname=Achternaam -user.email=Email -user.company=Bedrijf -user.department=Afdeling -user.note=Notitie -user.password=Wachtwoord -user.confirmpassword=Bevestig wachtwoord -user.emailsignal=Email notificatie -user.rank=Rank -user.rank.admin=Administrator -user.status=Status -user.status.active=Actief -user.submit=Opslaan -user.cancel=Annuleren -user.info=Info - -userlist.title=Gebruikersbeheer -userlist.groups=Groepen -userlist.contentroles=Content Rollen wijzigen -userlist.siteroles=Site Rollen wijzigen -userlist.removegroup=Groep verwijderen -userlist.removegroupquestion=Groep verwijderen? -userlist.newgroup=Nieuwe groep -userlist.users=Gebruikers -userlist.removeuser=Gebruiker verwijderen -userlist.removeuserquestion=Gebruiker verwijderen? -userlist.newuser=Nieuwe gebruiker -userlist.info=Informatie over gebruiker - -contentroles.title=Rollen -contentroles.description=Als er bij een rubriek geen rol is geselecteerd, gelden de rechten van de bovenliggende rubriek. -contentroles.submit=Opslaan -contentroles.cancel=Annuleren - -siteroles.title=Rollen -siteroles.description=Als er bij een pagina geen rol is geselecteerd, gelden de rechten van de bovenliggende pagina. -siteroles.submit=Opslaan -siteroles.cancel=Annuleren - -rights.page.title=Pagina rechten -rights.userson=Gebruikers met rechten op de {0} {1} : -rights.groupson=Groepen met rechten op de {0} {1} : - -rights.content.title=Content rechten - -error.password.incorrect=Wachtwoord is onjuist. -error.password.invalid=Wachtwoord moet minimaal 6 en maximaal 15 tekens lang zijn. -error.password.nomatch=Nieuwe wachtwoorden zijn niet gelijk. -error.newpassword.incorrect=Nieuw wachtwoord mag niet hetzelfde zijn als het huidige wachtwoord. - -error.username.invalid=Gebruikersnaam moet minimaal 3 en maximaal 15 tekens lang zijn. -error.username.alreadyexists=Gebruikersnaam bestaat al. -error.email.empty=E-mail moet worden ingevuld. -error.groupname.invalid= moet minimaal 3 en tekens lang zijn. -error.groupname.alreadyexists=bestaat al. - -showitem.close=Sluit dit venster. -showitem.groups=De gebruiker is lid van de volgende groep(en): - -user.notice=Items met een * zijn verplicht! -user.textlength=Maximaal 40 tekens. \ No newline at end of file +role.legend.userrights=Gebruikers rechten + +role.inherit=- +role.none=geen +role.writer=schrijver +role.editor=redacteur +role.chiefeditor=eindredacteur +role.webmaster=webmaster + +changeprofile.title=Mijn Profiel +changeprofile.succeeded=Mijn Profiel informatie is succesvol gewijzigd. +changeprofile.current=Huidig wachtwoord +changeprofile.new=Nieuw wachtwoord +changeprofile.confirm=Bevestig nieuw wachtwoord +changeprofile.submit=Opslaan + +changelanguage.title=Taal aanpassen +changelanguage.succeeded=De taalinstelling is succesvol gewijzigd. +changelanguage.language=Taal +changelanguage.default=Automatisch (browser) +changelanguage.english=Engels +changelanguage.dutch=Nederlands +changelanguage.chinese=Chinees +changelanguage.french=Frans +changelanguage.submit=Opslaan + +profile.title=Profiel + +edit_defaults.channelselect=Selecteer +edit_defaults.erase=Wis + +group.title=Groep +group.name=Naam +group.description=Omschrijving +group.simpleeditorchannel=Simple Editors rubriek +group.members=Leden +group.nonmembers=Gebruikers +group.submit=Opslaan +group.cancel=Annuleren + +user.title=Gebruiker: {0} +user.edit.title=Gebruiker +user.account=Account +user.name=Naam +user.firstname=Voornaam +user.prefix=Tussenvoegsels +user.surname=Achternaam +user.email=Email +user.company=Bedrijf +user.department=Afdeling +user.note=Notitie +user.password=Wachtwoord +user.confirmpassword=Bevestig wachtwoord +user.emailsignal=Email notificatie +user.rank=Rank +user.rank.admin=Administrator +user.status=Status +user.status.active=Actief +user.status.disabled=Geblokkeerd +user.submit=Opslaan +user.cancel=Annuleren +user.info=Info + +userlist.title=Gebruikersbeheer +userlist.groups=Groepen +userlist.contentroles=Content Rollen wijzigen +userlist.siteroles=Site Rollen wijzigen +userlist.removegroup=Groep verwijderen +userlist.removegroupquestion=Groep verwijderen? +userlist.newgroup=Nieuwe groep +userlist.users=Gebruikers +userlist.removeuser=Gebruiker verwijderen +userlist.removeuserquestion=Gebruiker verwijderen? +userlist.newuser=Nieuwe gebruiker +userlist.info=Informatie over gebruiker + +contentroles.title=Rollen +contentroles.description=Als er bij een rubriek geen rol is geselecteerd, gelden de rechten van de bovenliggende rubriek. +contentroles.submit=Opslaan +contentroles.cancel=Annuleren + +siteroles.title=Rollen +siteroles.description=Als er bij een pagina geen rol is geselecteerd, gelden de rechten van de bovenliggende pagina. +siteroles.submit=Opslaan +siteroles.cancel=Annuleren + +rights.page.title=Pagina rechten +rights.userson=Gebruikers met rechten op de {0} {1} : +rights.groupson=Groepen met rechten op de {0} {1} : + +rights.content.title=Content rechten + +error.password.incorrect=Wachtwoord is onjuist. +error.password.invalid=Wachtwoord moet minimaal 6 en maximaal 15 tekens lang zijn. +error.password.nomatch=Nieuwe wachtwoorden zijn niet gelijk. +error.newpassword.incorrect=Nieuw wachtwoord mag niet hetzelfde zijn als het huidige wachtwoord. + +error.username.invalid=Gebruikersnaam moet minimaal 3 en maximaal 15 tekens lang zijn. +error.username.alreadyexists=Gebruikersnaam bestaat al. +error.email.empty=E-mail moet worden ingevuld. +error.groupname.invalid= moet minimaal 3 en tekens lang zijn. +error.groupname.alreadyexists=bestaat al. + +showitem.close=Sluit dit venster. +showitem.groups=De gebruiker is lid van de volgende groep(en): + +user.notice=Items met een * zijn verplicht! +user.textlength=Maximaal 40 tekens. Modified: CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security_zh.properties =================================================================== --- CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security_zh.properties 2009-10-22 14:24:23 UTC (rev 39293) +++ CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security_zh.properties 2009-10-23 07:27:54 UTC (rev 39294) @@ -26,8 +26,8 @@ profile.title=外观 -edit_defaults.channelselect=Select -edit_defaults.erase=Erase +edit_defaults.channelselect=选择 +edit_defaults.erase=擦除 group.title=组 group.name=姓名 @@ -55,7 +55,8 @@ user.rank=等级 user.rank.admin=管理员 user.status=状态 -user.status.active=活动 +user.status.active=激活 +user.status.disabled=未激活 user.submit=保存 user.cancel=取消 user.info=信息 Modified: CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/UserForm.java =================================================================== --- CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/UserForm.java 2009-10-22 14:24:23 UTC (rev 39293) +++ CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/UserForm.java 2009-10-23 07:27:54 UTC (rev 39294) @@ -1,15 +1,19 @@ package com.finalist.cmsc.security.forms; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; -import org.apache.struts.action.*; +import javax.servlet.http.HttpServletRequest; + +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; import org.mmbase.bridge.NodeList; import com.finalist.cmsc.struts.MMBaseAction; import com.finalist.cmsc.struts.MMBaseForm; -import javax.servlet.http.HttpServletRequest; - /** * Form bean for the UserForm page. * @@ -43,6 +47,7 @@ private List<Option> ranks = new ArrayList<Option>(); private List<Option> contexts = new ArrayList<Option>(); + private List<Option> statuses = new ArrayList<Option>(); @Override @@ -301,15 +306,18 @@ return contexts; } + public void addStatus(String number, String name){ + statuses.add(new Option(name, number)); + } + public void resetStatuses(){ + statuses = new ArrayList<Option>(); + } + public List<Option> getStatuses() { - List<Option> statusList = new ArrayList<Option>(); - statusList.add(new Option("Actief", "1")); - statusList.add(new Option("Geblokkeerd", "-1")); - return statusList; + return statuses; } - public String getLanguage() { return language; } Modified: CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/UserInitAction.java =================================================================== --- CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/UserInitAction.java 2009-10-22 14:24:23 UTC (rev 39293) +++ CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/UserInitAction.java 2009-10-23 07:27:54 UTC (rev 39294) @@ -1,18 +1,23 @@ package com.finalist.cmsc.security.forms; +import java.util.Locale; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringUtils; +import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionForm; +import org.apache.struts.util.MessageResources; import org.mmbase.bridge.Cloud; import org.mmbase.bridge.Node; import org.mmbase.bridge.NodeIterator; import org.mmbase.bridge.NodeList; +import com.finalist.cmsc.security.SecurityUtil; import com.finalist.cmsc.struts.MMBaseAction; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** * @author Nico Klasens */ @@ -60,13 +65,30 @@ NodeList ranks = cloud.getNodeManager("mmbaseranks").getList(null, "rank", "down"); for (NodeIterator iter = ranks.nodeIterator(); iter.hasNext();) { Node rankNode = iter.nextNode(); - userForm.addRank(rankNode.getStringValue("number"), rankNode.getStringValue("name")); - } + String name = rankNode.getStringValue("name"); + String number = rankNode.getStringValue("number"); + if("basic user".equalsIgnoreCase(name)){ + userForm.setRank(number); + } + userForm.addRank(number, name); + } NodeList contexts = cloud.getNodeManager("mmbasecontexts").getList(null, "name", "down"); for (NodeIterator iter = contexts.nodeIterator(); iter.hasNext();) { Node contextNode = iter.nextNode(); userForm.addContext(contextNode.getStringValue("number"), contextNode.getStringValue("name")); } + Node userNode = SecurityUtil.getUserNode(cloud); + String language = userNode.getStringValue("language"); + Locale locale; + if(StringUtils.isEmpty(language)){ + locale = request.getLocale(); + }else{ + locale = new Locale(language); + } + MessageResources resources = getResources(request, "SECURITY"); + userForm.resetStatuses(); + userForm.addStatus("1", resources.getMessage(locale, "user.status.active")); + userForm.addStatus("-1", resources.getMessage(locale, "user.status.disabled")); return mapping.findForward(SUCCESS); } } \ No newline at end of file _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs