Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
32a310ca14 | ||
|
|
63df767bee | ||
|
|
e7f198427b | ||
|
|
38419ef257 |
@@ -18,6 +18,7 @@
|
||||
*/
|
||||
|
||||
import org.apache.ofbiz.base.util.UtilProperties
|
||||
import org.apache.ofbiz.base.util.UtilHttp
|
||||
import org.apache.ofbiz.base.util.UtilMisc
|
||||
import org.apache.ofbiz.product.store.ProductStoreWorker
|
||||
|
||||
@@ -54,5 +55,5 @@ if (userInfoMap) {
|
||||
request.getSession().setAttribute("userInfoMap", userInfoMap)
|
||||
}
|
||||
|
||||
donePage = "main;" + parameters.visit.sessionId
|
||||
donePage = "main;" + UtilHttp.getSessionId(request)
|
||||
context.donePage = donePage
|
||||
|
||||
@@ -25,7 +25,7 @@ under the License.
|
||||
|
||||
<handler name="java" type="request" class="org.apache.ofbiz.webapp.event.JavaEventHandler"/>
|
||||
<handler name="groovy" type="request" class="org.apache.ofbiz.webapp.event.GroovyEventHandler"/>
|
||||
<handler name="soap" type="request" class="org.apache.ofbiz.webapp.event.SOAPEventHandler"/>
|
||||
<!-- <handler name="soap" type="request" class="org.apache.ofbiz.webapp.event.SOAPEventHandler"/> -->
|
||||
<handler name="service" type="request" class="org.apache.ofbiz.webapp.event.ServiceEventHandler"/>
|
||||
<handler name="service-multi" type="request" class="org.apache.ofbiz.webapp.event.ServiceMultiEventHandler"/>
|
||||
<handler name="simple" type="request" class="org.apache.ofbiz.webapp.event.SimpleEventHandler"/>
|
||||
@@ -134,7 +134,7 @@ under the License.
|
||||
<request-map uri="setSessionLocale">
|
||||
<security https="false" auth="false"/>
|
||||
<event type="java" path="org.apache.ofbiz.common.CommonEvents" invoke="setSessionLocale"/>
|
||||
<response name="success" type="request-redirect" value="fromSetSessionLocale"/>
|
||||
<response name="success" type="request-redirect" value="fromSetSessionLocale"/>
|
||||
<response name="error" type="view" value="main"/>
|
||||
</request-map>
|
||||
|
||||
|
||||
+1
-1
@@ -18,5 +18,5 @@
|
||||
*/
|
||||
|
||||
dependencies {
|
||||
pluginLibsCompile 'org.jasig.cas:cas-server-core:3.3.5'
|
||||
pluginLibsCompile 'org.apereo.cas:cas-server-support-ldap-core:5.0.10'
|
||||
}
|
||||
+4
-2
@@ -29,7 +29,8 @@ import javax.naming.directory.InitialDirContext;
|
||||
import javax.naming.directory.SearchControls;
|
||||
import javax.naming.directory.SearchResult;
|
||||
|
||||
import org.jasig.cas.util.LdapUtils;
|
||||
import org.apereo.cas.util.LdapUtils;
|
||||
import org.ldaptive.LdapEntry;
|
||||
import org.apache.ofbiz.base.util.UtilXml;
|
||||
import org.apache.ofbiz.ldap.commons.AbstractOFBizAuthenticationHandler;
|
||||
import org.w3c.dom.Element;
|
||||
@@ -91,7 +92,8 @@ public final class OFBizActiveDirectoryAuthenticationHandler extends AbstractOFB
|
||||
}
|
||||
String filter = UtilXml.childElementValue(rootElement, "Filter", "(objectclass=*)");
|
||||
String attribute = UtilXml.childElementValue(rootElement, "Attribute", "uid=%u");
|
||||
attribute = LdapUtils.getFilterWithValues(attribute, username);
|
||||
LdapEntry entry = new LdapEntry(username);
|
||||
attribute = LdapUtils.getString(entry, attribute);
|
||||
NamingEnumeration<SearchResult> answer = ctx.search(baseDN,
|
||||
// Filter expression
|
||||
"(&(" + filter + ") (" + attribute +"))",
|
||||
|
||||
+4
-2
@@ -27,7 +27,8 @@ import javax.naming.directory.DirContext;
|
||||
import javax.naming.directory.InitialDirContext;
|
||||
import javax.naming.directory.SearchControls;
|
||||
import javax.naming.directory.SearchResult;
|
||||
import org.jasig.cas.util.LdapUtils;
|
||||
import org.apereo.cas.util.LdapUtils;
|
||||
import org.ldaptive.LdapEntry;
|
||||
import org.apache.ofbiz.base.util.UtilXml;
|
||||
import org.apache.ofbiz.ldap.commons.AbstractOFBizAuthenticationHandler;
|
||||
import org.w3c.dom.Element;
|
||||
@@ -76,7 +77,8 @@ public final class OFBizLdapAuthenticationHandler extends AbstractOFBizAuthentic
|
||||
}
|
||||
String filter = UtilXml.childElementValue(rootElement, "Filter", "(objectclass=*)");
|
||||
String attribute = UtilXml.childElementValue(rootElement, "Attribute", "uid=%u");
|
||||
attribute = LdapUtils.getFilterWithValues(attribute, username);
|
||||
LdapEntry entry = new LdapEntry(username);
|
||||
attribute = LdapUtils.getString(entry, attribute);
|
||||
NamingEnumeration<SearchResult> answer = ctx.search(baseDN,
|
||||
// Filter expression
|
||||
"(&(" + filter + ") (" + attribute +"))",
|
||||
|
||||
@@ -221,14 +221,14 @@ under the License.
|
||||
<service name="checkSprintStatus" engine="simple" auth="true"
|
||||
location="component://scrum/minilang/ScrumServices.xml" invoke="checkSprintStatus">
|
||||
</service>
|
||||
<service name="checkScrumPlanHour" engine="simple" auth="true"
|
||||
<service name="checkScrumPlanHour" engine="simple" auth="true"
|
||||
location="component://scrum/minilang/ScrumServices.xml" invoke="checkScrumPlanHour">
|
||||
<attribute name="workEffortId" type="String" mode="IN" optional="true"/>
|
||||
<attribute name="custRequestId" type="String" mode="IN" optional="true"/>
|
||||
<attribute name="planHours" type="Double" mode="IN" optional="true"/>
|
||||
<attribute name="allow" type="Boolean" mode="OUT" optional="false"/>
|
||||
</service>
|
||||
<service name="reOrderProductBacklogItemSequenceNumber" engine="simple" auth="true"
|
||||
<service name="reOrderProductBacklogItemSequenceNumber" engine="simple" auth="true"
|
||||
location="component://scrum/minilang/ScrumServices.xml" invoke="reOrderProductBacklogItemSequenceNumber">
|
||||
<attribute name="productId" type="String" mode="IN" optional="false"/>
|
||||
</service>
|
||||
@@ -250,11 +250,11 @@ under the License.
|
||||
<description>Updates the Timesheet status back to in process to be able to correct errors</description>
|
||||
<auto-attributes include="pk" mode="IN" optional="false"/>
|
||||
</service>
|
||||
|
||||
<service name="updateScrumRevision" engine="soap" export="true"
|
||||
<!-- The service below has been commented out for security reason, see OFBIZ-12212 -->
|
||||
<!-- <service name="updateScrumRevision" engine="soap" export="true"
|
||||
location="http://www.example.com/webtools/control/SOAPService" invoke="updateScrumRevisionChange">
|
||||
<implements service="updateScrumRevisionChange"/>
|
||||
</service>
|
||||
</service> -->
|
||||
<service name="updateScrumRevisionChange" engine="simple" export="true" validate="false" require-new-transaction="true"
|
||||
location="component://scrum/minilang/ScrumServices.xml" invoke="updateScrumRevisionChange">
|
||||
<description>Update Scrum Revision Change</description>
|
||||
@@ -287,7 +287,7 @@ under the License.
|
||||
|
||||
<service name="linkToProduct" engine="java" auth="true"
|
||||
location="org.apache.ofbiz.scrum.ScrumServices" invoke="linkToProduct">
|
||||
<description>check when a comunication event is created if the subject contains the PD# string, if so
|
||||
<description>check when a comunication event is created if the subject contains the PD# string, if so
|
||||
try to find the customer request and link it to the communication event..
|
||||
</description>
|
||||
<attribute name="communicationEventId" type="String" mode="IN" optional="false"/>
|
||||
|
||||
Reference in New Issue
Block a user