ziver/zallery
1
0
Fork 0
Code Pull requests Releases Activity

Updated TokBox and allowing super user to see private folders

Browse source
This commit is contained in:
Ziver Koc 2012-08-02 20:59:35 +00:00
parent ed1505254d
commit b6adc5c402
4 changed files with 10 additions and 1455 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/zall/bean/Folder.java
View file

@ -36,16 +36,18 @@ public class Folder extends DBBean{
return load(db, Folder.class, id);
}
public static List<Folder> loadSubFolders(DBConnection db, Long id, User user) throws SQLException{
PreparedStatement sql = db.getPreparedStatement("SELECT * FROM Folder WHERE parent=? AND (isPrivate=0 OR user=?)");
PreparedStatement sql = db.getPreparedStatement("SELECT * FROM Folder WHERE parent=? AND (isPrivate=0 OR user=? OR ?)");
sql.setLong(1, id);
sql.setLong(2, user.getId());
sql.setBoolean(3, user.isSuperUser());
return DBConnection.exec(sql, DBBeanSQLResultHandler.createList(Folder.class, db));
}
public static Folder loadRoot(DBConnection db, User user) throws SQLException{
PreparedStatement sql = db.getPreparedStatement("SELECT * FROM Folder WHERE path=? AND (isPrivate=0 OR user=?)");
PreparedStatement sql = db.getPreparedStatement("SELECT * FROM Folder WHERE path=? AND (isPrivate=0 OR user=? OR ?)");
sql.setString(1, "/");
sql.setLong(2, user.getId());
sql.setBoolean(3, user.isSuperUser());
return DBConnection.exec(sql, DBBeanSQLResultHandler.create(Folder.class, db));
}

1441
src/zall/util/test/Converter.java
View file

File diff suppressed because it is too large Load diff