Merge pull request baasbox#137 from giastfader/master

giastfader · giastfader · commit 140859c60e36 · 2013-11-16T03:23:10.000-08:00
fixed baasbox#136
diff --git a/app/com/baasbox/dao/FileAssetDao.java b/app/com/baasbox/dao/FileAssetDao.java
@@ -57,7 +57,7 @@ public ODocument create(String name, String fileName, String contentType, byte[]
 		asset.field("contentType",contentType);
 		asset.field("contentLength",content.length);
 		super.grantPermission(asset, Permissions.ALLOW_READ,DefaultRoles.getORoles());
-		super.grantPermission(asset, Permissions.ALLOW_UPDATE,DefaultRoles.getORoles());
+		super.grantPermission(asset, Permissions.ALLOW_UPDATE,DefaultRoles.getORoles()); //this is necessary due the resize API
 		return asset;
 	}
 	
diff --git a/app/com/baasbox/db/DbHelper.java b/app/com/baasbox/db/DbHelper.java
@@ -439,7 +439,7 @@ public static void setupDb(OGraphDatabase db) throws Exception{
 	public static void exportData(String appcode,OutputStream os) throws UnableToExportDbException{
 		OGraphDatabase db = null;
 		try{
-			db = open(appcode, "admin", "admin");
+			db = open(appcode, BBConfiguration.getBaasBoxAdminUsername(), BBConfiguration.getBaasBoxAdminPassword());
 			
 			ODatabaseExport oe = new ODatabaseExport(db, os, new OCommandOutputListener() {
 				@Override

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public ODocument create(String name, String fileName, String contentType, byte[]`
`57`	`57`	`asset.field("contentType",contentType);`
`58`	`58`	`asset.field("contentLength",content.length);`
`59`	`59`	`super.grantPermission(asset, Permissions.ALLOW_READ,DefaultRoles.getORoles());`
`60`		`- super.grantPermission(asset, Permissions.ALLOW_UPDATE,DefaultRoles.getORoles());`
	`60`	`+ super.grantPermission(asset, Permissions.ALLOW_UPDATE,DefaultRoles.getORoles()); //this is necessary due the resize API`
`61`	`61`	`return asset;`
`62`	`62`	`}`
`63`	`63`