MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 22:25:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

browser: Send correct arguments for RemoveObjects web handler. (#3848)

Browse Source 
Fixes #3839
This commit is contained in:
Krishna Srinivas 2017-03-03 17:07:17 -08:00 committed by Harshavardhana
parent 05e53f1b34
commit 0bae3330e8
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
browser/app/js/components/Browse.js
View File

@ -228,12 +228,13 @@ export default class Browse extends React.Component {
removeObject() { removeObject() {
const {web, dispatch, currentPath, currentBucket, deleteConfirmation} = this.props const {web, dispatch, currentPath, currentBucket, deleteConfirmation} = this.props
web.RemoveObject({ web.RemoveObject({
bucketName: currentBucket, bucketname: currentBucket,
objectName: deleteConfirmation.object objects: [deleteConfirmation.object]
}) })
.then(() => { .then(() => {
this.hideDeleteConfirmation() this.hideDeleteConfirmation()
dispatch(actions.removeObject(deleteConfirmation.object)) let delObject = deleteConfirmation.object.replace(currentPath, '')
dispatch(actions.removeObject(delObject))
}) })
.catch(e => dispatch(actions.showAlert({ .catch(e => dispatch(actions.showAlert({
type: 'danger', type: 'danger',

1
browser/app/js/reducers.js
View File

@ -199,7 +199,6 @@ export default (state = {
newState.checkedObjects = [] newState.checkedObjects = []
break break
} }
console.log(newState.checkedObjects)
return newState return newState
} }

8
cmd/web-handlers.go
View File

@ -257,7 +257,7 @@ func (web *webAPIHandlers) ListObjects(r *http.Request, args *ListObjectsArgs, r
// RemoveObjectArgs - args to remove an object // RemoveObjectArgs - args to remove an object
// JSON will look like: // JSON will look like:
// '{"bucketname":"testbucket","prefix":"john/pics/","objects":["hawaii/","maldives/","sanjose.jpg"]}' // '{"bucketname":"testbucket","objects":["photos/hawaii/","photos/maldives/","photos/sanjose.jpg"]}'
type RemoveObjectArgs struct { type RemoveObjectArgs struct {
Objects []string `json:"objects"` // can be files or sub-directories Objects []string `json:"objects"` // can be files or sub-directories
Prefix string `json:"prefix"` // current directory in the browser-ui Prefix string `json:"prefix"` // current directory in the browser-ui
@ -300,8 +300,8 @@ objectLoop:
return err return err
} }
if !hasSuffix(object, slashSeparator) { if !hasSuffix(object, slashSeparator) {
// If not a directory, compress the file and write it to response. // If not a directory, remove the object.
err = remove(pathJoin(args.Prefix, object)) err = remove(object)
if err != nil { if err != nil {
break objectLoop break objectLoop
} }
@ -311,7 +311,7 @@ objectLoop:
marker := "" marker := ""
for { for {
var lo ListObjectsInfo var lo ListObjectsInfo
lo, err = objectAPI.ListObjects(args.BucketName, pathJoin(args.Prefix, object), marker, "", 1000) lo, err = objectAPI.ListObjects(args.BucketName, object, marker, "", 1000)
if err != nil { if err != nil {
break objectLoop break objectLoop
} }

4
cmd/web-handlers_test.go
View File

@ -477,7 +477,7 @@ func testRemoveObjectWebHandler(obj ObjectLayer, instanceType string, t TestErrH
t.Fatalf("Was not able to upload an object, %v", err) t.Fatalf("Was not able to upload an object, %v", err)
} }
removeObjectRequest := RemoveObjectArgs{BucketName: bucketName, Prefix: "", Objects: []string{"a/", "object"}} removeObjectRequest := RemoveObjectArgs{BucketName: bucketName, Objects: []string{"a/", "object"}}
removeObjectReply := &WebGenericRep{} removeObjectReply := &WebGenericRep{}
req, err := newTestWebRPCRequest("Web.RemoveObject", authorization, removeObjectRequest) req, err := newTestWebRPCRequest("Web.RemoveObject", authorization, removeObjectRequest)
if err != nil { if err != nil {
@ -492,7 +492,7 @@ func testRemoveObjectWebHandler(obj ObjectLayer, instanceType string, t TestErrH
t.Fatalf("Failed, %v", err) t.Fatalf("Failed, %v", err)
} }
removeObjectRequest = RemoveObjectArgs{BucketName: bucketName, Prefix: "", Objects: []string{"a/", "object"}} removeObjectRequest = RemoveObjectArgs{BucketName: bucketName, Objects: []string{"a/", "object"}}
removeObjectReply = &WebGenericRep{} removeObjectReply = &WebGenericRep{}
req, err = newTestWebRPCRequest("Web.RemoveObject", authorization, removeObjectRequest) req, err = newTestWebRPCRequest("Web.RemoveObject", authorization, removeObjectRequest)
if err != nil { if err != nil {