Skip to content

Fixed issue with calculated attributes in combination with CurrentUser #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 28, 2017
Merged

Fixed issue with calculated attributes in combination with CurrentUser #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3b0aec
Fixed bug where data was retrieved using the system context. This cau…
RoelandSalij Aug 28, 2017
e383260
Added a fix which was applied in Team server project earlier to ensur…
RoelandSalij Aug 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified src/AuditTrailModule/Audit trail.mpr
View file
Open in desktop
Binary file not shown.
66 changes: 33 additions & 33 deletions src/AuditTrailModule/javasource/audittrail/log/CreateLogObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ else if( logObject.hasMember(association) ) {

}

if( createLogLines(auditableObject, logObject, sudoContext, logType, association) > 0 ) {

if( createLogLines(auditableObject, logObject, sudoContext, context, logType, association) > 0 ) {
Core.commit(sudoContext, logObject);
return logObject;
}
else if( CreateLogObjectWithoutMemberChanges ) {
Expand All @@ -193,7 +193,7 @@ else if( CreateLogObjectWithoutMemberChanges ) {
}
}

private static int createLogLines(IMendixObject inputObject, IMendixObject logObject, IContext sudoContext, TypeOfLog logType, String skipAssociation ) throws CoreException{
private static int createLogLines(IMendixObject inputObject, IMendixObject logObject, IContext sudoContext,IContext currentContext, TypeOfLog logType, String skipAssociation ) throws CoreException{
boolean isNew = false;
if( logType != TypeOfLog.Delete ) {
// The object is new
Expand Down Expand Up @@ -222,11 +222,11 @@ private static int createLogLines(IMendixObject inputObject, IMendixObject logOb
line = null;
if (member instanceof MendixObjectReference){
if( !member.getName().startsWith("System.") )
line = createReferenceLogLine(logObject, member, isNew, sudoContext);
line = createReferenceLogLine(logObject, member, isNew, sudoContext, currentContext);
}

else if( member instanceof MendixObjectReferenceSet)
line = createReferenceSetLogLine(logObject, member, isNew, sudoContext);
line = createReferenceSetLogLine(logObject, member, isNew, sudoContext,currentContext);

else{
String attributeName = member.getName();
Expand Down Expand Up @@ -278,31 +278,31 @@ private static IMendixObject createSingleLogLine( IMendixObject logObject, IMend
}


private static IMendixObject createReferenceLogLine(IMendixObject logObject, IMendixObjectMember<?> member, boolean isNew, IContext context) throws CoreException {
private static IMendixObject createReferenceLogLine(IMendixObject logObject, IMendixObjectMember<?> member, boolean isNew, IContext sudocontext, IContext currentcontext) throws CoreException {
//get current and previous id
IMendixIdentifier cID = (IMendixIdentifier) member.getValue(context);
IMendixIdentifier pID = (IMendixIdentifier) member.getOriginalValue(context);
IMendixIdentifier cID = (IMendixIdentifier) member.getValue(currentcontext);
IMendixIdentifier pID = (IMendixIdentifier) member.getOriginalValue(currentcontext);

// Get the values of reference objects
String pValue = getValueFromReference(pID, context);
String newValue = getValueFromReference(cID, context);
String pValue = getValueFromReference(pID, currentcontext);
String newValue = getValueFromReference(cID, currentcontext);

if( IncludeOnlyChangedAttributes == false || !pValue.equals(newValue) || isNew ) {
IMendixObject logLine = Core.instantiate(context, LogLine.getType());
IMendixObject logLine = Core.instantiate(sudocontext, LogLine.getType());

logLine.setValue(context, LogLine.MemberNames.Member.toString(), member.getName() );
logLine.setValue(context, LogLine.MemberNames.MemberType.toString(), MemberType.Reference.toString() );
logLine.setValue(context, LogLine.MemberNames.LogLine_Log.toString(), logObject.getId() );
logLine.setValue(context, LogLine.MemberNames.NewValue.toString(), newValue );
logLine.setValue(sudocontext, LogLine.MemberNames.Member.toString(), member.getName() );
logLine.setValue(sudocontext, LogLine.MemberNames.MemberType.toString(), MemberType.Reference.toString() );
logLine.setValue(sudocontext, LogLine.MemberNames.LogLine_Log.toString(), logObject.getId() );
logLine.setValue(sudocontext, LogLine.MemberNames.NewValue.toString(), newValue );

if (isNew)
logLine.setValue(context, LogLine.MemberNames.OldValue.toString(), "" );
logLine.setValue(sudocontext, LogLine.MemberNames.OldValue.toString(), "" );
else
logLine.setValue(context, LogLine.MemberNames.OldValue.toString(), pValue );
logLine.setValue(sudocontext, LogLine.MemberNames.OldValue.toString(), pValue );

if( !logLine.getValue(context, LogLine.MemberNames.OldValue.toString()).equals(logLine.getValue(context, LogLine.MemberNames.NewValue.toString())) || isNew ) {
if( !logLine.getValue(sudocontext, LogLine.MemberNames.OldValue.toString()).equals(logLine.getValue(sudocontext, LogLine.MemberNames.NewValue.toString())) || isNew ) {
_logNode.trace("Member: " + member.getName() + " has changed.");
logObject.setValue(context, Log.MemberNames.NumberOfChangedMembers.toString(), (Integer) logObject.getValue(context, Log.MemberNames.NumberOfChangedMembers.toString()) + 1 );
logObject.setValue(sudocontext, Log.MemberNames.NumberOfChangedMembers.toString(), (Integer) logObject.getValue(sudocontext, Log.MemberNames.NumberOfChangedMembers.toString()) + 1 );
}

return logLine;
Expand Down Expand Up @@ -337,39 +337,39 @@ private static String getValueFromReference(IMendixIdentifier ID, IContext conte


@SuppressWarnings("unchecked")
private static IMendixObject createReferenceSetLogLine(IMendixObject logObject, IMendixObjectMember<?> member, boolean isNew, IContext context) throws CoreException {
private static IMendixObject createReferenceSetLogLine(IMendixObject logObject, IMendixObjectMember<?> member, boolean isNew, IContext sudocontext, IContext currentcontext) throws CoreException {
String currentValue = "", previousValue = "";

List<IMendixIdentifier> currentIDList = (List<IMendixIdentifier>) member.getValue(context);
List<IMendixIdentifier> previousIDList = (List<IMendixIdentifier>) member.getOriginalValue(context);
List<IMendixIdentifier> currentIDList = (List<IMendixIdentifier>) member.getValue(currentcontext);
List<IMendixIdentifier> previousIDList = (List<IMendixIdentifier>) member.getOriginalValue(currentcontext);

if ( currentIDList != null && currentIDList.size() > 0 ) {
for (IMendixIdentifier id : currentIDList) {
currentValue += getValueFromReference(id, context);
currentValue += getValueFromReference(id, currentcontext);
}
}

if ( previousIDList != null && previousIDList.size() > 0 ) {
for (IMendixIdentifier id : previousIDList) {
previousValue += getValueFromReference(id, context);
previousValue += getValueFromReference(id, currentcontext);
}
}

if( IncludeOnlyChangedAttributes == false || !previousValue.equals(currentValue) || isNew ) {
IMendixObject logLine = Core.instantiate(context, LogLine.getType());
logLine.setValue(context, LogLine.MemberNames.Member.toString(), member.getName() );
logLine.setValue(context, LogLine.MemberNames.MemberType.toString(), MemberType.ReferenceSet.toString() );
logLine.setValue(context, LogLine.MemberNames.LogLine_Log.toString(), logObject.getId() );
logLine.setValue(context, LogLine.MemberNames.NewValue.toString(), currentValue );
IMendixObject logLine = Core.instantiate(sudocontext, LogLine.getType());
logLine.setValue(sudocontext, LogLine.MemberNames.Member.toString(), member.getName() );
logLine.setValue(sudocontext, LogLine.MemberNames.MemberType.toString(), MemberType.ReferenceSet.toString() );
logLine.setValue(sudocontext, LogLine.MemberNames.LogLine_Log.toString(), logObject.getId() );
logLine.setValue(sudocontext, LogLine.MemberNames.NewValue.toString(), currentValue );

if (isNew)
logLine.setValue(context, LogLine.MemberNames.OldValue.toString(), "" );
logLine.setValue(sudocontext, LogLine.MemberNames.OldValue.toString(), "" );
else
logLine.setValue(context, LogLine.MemberNames.OldValue.toString(), previousValue );
logLine.setValue(sudocontext, LogLine.MemberNames.OldValue.toString(), previousValue );

if( !logLine.getValue(context, LogLine.MemberNames.OldValue.toString()).equals(logLine.getValue(context, LogLine.MemberNames.NewValue.toString())) || isNew ) {
if( !logLine.getValue(sudocontext, LogLine.MemberNames.OldValue.toString()).equals(logLine.getValue(currentcontext, LogLine.MemberNames.NewValue.toString())) || isNew ) {
_logNode.trace("Member: " + member.getName() + " has changed.");
logObject.setValue(context, Log.MemberNames.NumberOfChangedMembers.toString(), (Integer) logObject.getValue(context, Log.MemberNames.NumberOfChangedMembers.toString()) + 1 );
logObject.setValue(sudocontext, Log.MemberNames.NumberOfChangedMembers.toString(), (Integer) logObject.getValue(currentcontext, Log.MemberNames.NumberOfChangedMembers.toString()) + 1 );
}

return logLine;
Expand Down