Merge branch 'develop' into oauth_client

This commit is contained in:
Everett Sochowski 2013-06-11 12:01:45 +02:00
commit 4ad6f74769
2 changed files with 2 additions and 3 deletions

View File

@ -284,7 +284,6 @@ object OBPAPI1_2 extends OBPRestHelper with Loggable {
}
})
oauthServe(apiPrefix{
//delete access for specific user to all the views
case "banks" :: bankId :: "accounts" :: accountId :: "permissions" :: userId :: "views" :: Nil JsonDelete json => {

View File

@ -588,7 +588,7 @@ class MongoDBLocalStorage extends LocalStorage {
HostedAccount.find(By(HostedAccount.accountID,account.id)) match {
case Full(acc) => {
val privileges = Privilege.findAll(By(Privilege.account, acc.id.get))
val privileges = Privilege.findAll(By(Privilege.account, acc.id.get)).sortWith((p1,p2) => p1.updatedAt.get after p2.updatedAt.get)
val permissions : List[Box[Permission]] = privileges.map( p => {
if(
p.ourNetworkPermission.get != false
@ -654,7 +654,7 @@ class MongoDBLocalStorage extends LocalStorage {
Empty
}
}
}
def revokePermission(bankAccountId : String, view : View, user : User) : Box[Boolean] = {
user match {