Added Rename modal for filenames longer than 200 characters in Windows (#2137)
Signed-off-by: Benjamin Perez <benjamin@bexsoft.net>
This commit is contained in:
@@ -40,10 +40,14 @@ func NewDownloadObjectParams() DownloadObjectParams {
|
||||
var (
|
||||
// initialize parameters with default values
|
||||
|
||||
overrideFileNameDefault = string("")
|
||||
|
||||
previewDefault = bool(false)
|
||||
)
|
||||
|
||||
return DownloadObjectParams{
|
||||
OverrideFileName: &overrideFileNameDefault,
|
||||
|
||||
Preview: &previewDefault,
|
||||
}
|
||||
}
|
||||
@@ -62,6 +66,11 @@ type DownloadObjectParams struct {
|
||||
In: path
|
||||
*/
|
||||
BucketName string
|
||||
/*
|
||||
In: query
|
||||
Default: ""
|
||||
*/
|
||||
OverrideFileName *string
|
||||
/*
|
||||
Required: true
|
||||
In: query
|
||||
@@ -94,6 +103,11 @@ func (o *DownloadObjectParams) BindRequest(r *http.Request, route *middleware.Ma
|
||||
res = append(res, err)
|
||||
}
|
||||
|
||||
qOverrideFileName, qhkOverrideFileName, _ := qs.GetOK("override_file_name")
|
||||
if err := o.bindOverrideFileName(qOverrideFileName, qhkOverrideFileName, route.Formats); err != nil {
|
||||
res = append(res, err)
|
||||
}
|
||||
|
||||
qPrefix, qhkPrefix, _ := qs.GetOK("prefix")
|
||||
if err := o.bindPrefix(qPrefix, qhkPrefix, route.Formats); err != nil {
|
||||
res = append(res, err)
|
||||
@@ -128,6 +142,25 @@ func (o *DownloadObjectParams) bindBucketName(rawData []string, hasKey bool, for
|
||||
return nil
|
||||
}
|
||||
|
||||
// bindOverrideFileName binds and validates parameter OverrideFileName from query.
|
||||
func (o *DownloadObjectParams) bindOverrideFileName(rawData []string, hasKey bool, formats strfmt.Registry) error {
|
||||
var raw string
|
||||
if len(rawData) > 0 {
|
||||
raw = rawData[len(rawData)-1]
|
||||
}
|
||||
|
||||
// Required: false
|
||||
// AllowEmptyValue: false
|
||||
|
||||
if raw == "" { // empty values pass all other validations
|
||||
// Default values have been previously initialized by NewDownloadObjectParams()
|
||||
return nil
|
||||
}
|
||||
o.OverrideFileName = &raw
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// bindPrefix binds and validates parameter Prefix from query.
|
||||
func (o *DownloadObjectParams) bindPrefix(rawData []string, hasKey bool, formats strfmt.Registry) error {
|
||||
if !hasKey {
|
||||
|
||||
@@ -35,9 +35,10 @@ import (
|
||||
type DownloadObjectURL struct {
|
||||
BucketName string
|
||||
|
||||
Prefix string
|
||||
Preview *bool
|
||||
VersionID *string
|
||||
OverrideFileName *string
|
||||
Prefix string
|
||||
Preview *bool
|
||||
VersionID *string
|
||||
|
||||
_basePath string
|
||||
// avoid unkeyed usage
|
||||
@@ -80,6 +81,14 @@ func (o *DownloadObjectURL) Build() (*url.URL, error) {
|
||||
|
||||
qs := make(url.Values)
|
||||
|
||||
var overrideFileNameQ string
|
||||
if o.OverrideFileName != nil {
|
||||
overrideFileNameQ = *o.OverrideFileName
|
||||
}
|
||||
if overrideFileNameQ != "" {
|
||||
qs.Set("override_file_name", overrideFileNameQ)
|
||||
}
|
||||
|
||||
prefixQ := o.Prefix
|
||||
if prefixQ != "" {
|
||||
qs.Set("prefix", prefixQ)
|
||||
|
||||
Reference in New Issue
Block a user