svn commit: r454138 - in /incubator/ofbiz/trunk/framework/common: config/CommonUiLabels.properties config/CommonUiLabels_nl.properties servicedef/services.xml src/org/ofbiz/common/login/LoginServices.java

[hansbak-2]

Author: hansbak
Date: Sun Oct  8 05:59:16 2006
New Revision: 454138

URL: http://svn.apache.org/viewvc?view=rev&rev=454138
Log:
allw the 'enabled' field to be set at userLogin Creation, add some button labels

Modified:
    incubator/ofbiz/trunk/framework/common/config/CommonUiLabels.properties
    incubator/ofbiz/trunk/framework/common/config/CommonUiLabels_nl.properties
    incubator/ofbiz/trunk/framework/common/servicedef/services.xml
    incubator/ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java

Modified: incubator/ofbiz/trunk/framework/common/config/CommonUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/config/CommonUiLabels.properties?view=diff&rev=454138&r1=454137&r2=454138
==============================================================================
--- incubator/ofbiz/trunk/framework/common/config/CommonUiLabels.properties (original)
+++ incubator/ofbiz/trunk/framework/common/config/CommonUiLabels.properties Sun Oct  8 05:59:16 2006
@@ -476,6 +476,8 @@
 FormFieldTitle_currencyUomId=Currency
 FormFieldTitle_comments=Comments
 FormFieldTitle_createButton=Create
+FormFieldTitle_deleteButton=Delete
+FormFieldTitle_deleteSelectedButton=Delete Selected
 FormFieldTitle_effectiveDate=Effective Date
 FormFieldTitle_description=Description
 FormFieldTitle_lineTotal=Line Total

Modified: incubator/ofbiz/trunk/framework/common/config/CommonUiLabels_nl.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/config/CommonUiLabels_nl.properties?view=diff&rev=454138&r1=454137&r2=454138
==============================================================================
--- incubator/ofbiz/trunk/framework/common/config/CommonUiLabels_nl.properties (original)
+++ incubator/ofbiz/trunk/framework/common/config/CommonUiLabels_nl.properties Sun Oct  8 05:59:16 2006
@@ -445,6 +445,8 @@
 FormFieldTitle_currencyUomId=Valuta
 FormFieldTitle_comments=Opmerkingen
 FormFieldTitle_createButton=Toevoegen
+FormFieldTitle_deleteButton=Verwijderen
+FormFieldTitle_deleteSelectedButton=Geselecteerde Verwijderen
 FormFieldTitle_description=Beschrijving
 FormFieldTitle_lineTotal=Lijn Totaal
 FormFieldTitle_effectiveDate=Effectieve Datum

Modified: incubator/ofbiz/trunk/framework/common/servicedef/services.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/servicedef/services.xml?view=diff&rev=454138&r1=454137&r2=454138
==============================================================================
--- incubator/ofbiz/trunk/framework/common/servicedef/services.xml (original)
+++ incubator/ofbiz/trunk/framework/common/servicedef/services.xml Sun Oct  8 05:59:16 2006
@@ -327,6 +327,7 @@
         location="org.ofbiz.common.login.LoginServices" invoke="createUserLogin">
         <description>Create a UserLogin</description>
         <attribute name="userLoginId" type="String" mode="IN" optional="false"/>
+        <attribute name="enabled" type="String" mode="IN" optional="true"/>
         <attribute name="currentPassword" type="String" mode="IN" optional="false"/>
         <attribute name="currentPasswordVerify" type="String" mode="IN" optional="false"/>
         <attribute name="passwordHint" type="String" mode="IN" optional="true"/>

Modified: incubator/ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java?view=diff&rev=454138&r1=454137&r2=454138
==============================================================================
--- incubator/ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java (original)
+++ incubator/ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java Sun Oct  8 05:59:16 2006
@@ -365,6 +365,7 @@
         String partyId = (String) context.get("partyId");
         String currentPassword = (String) context.get("currentPassword");
         String currentPasswordVerify = (String) context.get("currentPasswordVerify");
+        String enabled = (String) context.get("enabled");
         String passwordHint = (String) context.get("passwordHint");
         String errMsg = null;
 
@@ -400,6 +401,7 @@
 
         GenericValue userLoginToCreate = delegator.makeValue("UserLogin", UtilMisc.toMap("userLoginId", userLoginId));
         userLoginToCreate.set("passwordHint", passwordHint);
+        userLoginToCreate.set("enabled", enabled);
         userLoginToCreate.set("partyId", partyId);
         userLoginToCreate.set("currentPassword", useEncryption ? getPasswordHash(currentPassword) : currentPassword);