LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[UPDATE] 

- adds id generation for ng class of permission

git-svn-id: https://svn.libreccm.org/ccm/trunk@4638 8810af33-2d31-482b-a856-94f89814c4df
master
tosmers 2017-03-22 21:02:13 +00:00
parent 36e86ffda3
commit 3c71f60e4d
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ccm-core/src/com/arsdigita/portation/AbstractMarshaller.java
View File

@ -98,9 +98,12 @@ public abstract class AbstractMarshaller<P extends Portable> {
line = xmlMapper.writeValueAsString(object);
//log.info(line);
} catch (IOException e) {
log.error(String.format("Unable to write objetct " +
"of %s as XML string with name %s.",
object.getClass(), file.getName()), e);
log.error(String.format(
"Unable to write objetct of %s as XML " +
"string with name %s in file %s.",
object.getClass(),
object.toString(),
file.getName()), e);
}
break;
@ -113,8 +116,9 @@ public abstract class AbstractMarshaller<P extends Portable> {
fileWriter.write(line);
fileWriter.write(System.getProperty("line.separator"));
} catch (IOException e) {
log.error(String.format("Unable to write to file with the" +
" name %s.", file.getName()));
log.error(String.format(
"Unable to write to file with the name %s.",
file.getName()));
}
}
}

21
ccm-core/src/com/arsdigita/portation/modules/core/security/PermissionIdGenerator.java
View File

@ -62,9 +62,22 @@ public class PermissionIdGenerator extends ObjectIdGenerator<String> {
final Permission permission = (Permission) forPojo;
return String.format("{%s}{%s}{%s}",
permission.getGrantedPrivilege(),
permission.getObject(),
permission.getGrantee());
String id = permission.getGrantedPrivilege() +
permission.getPermissionId();
boolean a = false, b = false;
if (permission.getObject() != null) {
id += permission.getObject().getUuid();
a = true;
}
if (permission.getGrantee() != null) {
id += permission.getGrantee().getName();
b = true;
}
// if (!(a || b)) {
// throw new IllegalStateException();
// }
return id;
}
}