opensource/filestash
1
0
Fork 0
mirror of https://github.com/mickael-kerjean/filestash.git synced 2025-10-31 10:07:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Mickael Kerjean
2021-08-08 22:01:56 +10:00
parent 137b36e0a7
commit 8543b51b6b
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/pages/filespage.js
View File

@ -266,7 +266,7 @@ export class FilesPage extends React.Component {
<InfiniteScroll pageStart={0} loader={$moreLoading} hasMore={this.state.files.length > 70} <InfiniteScroll pageStart={0} loader={$moreLoading} hasMore={this.state.files.length > 70}
initialLoad={false} useWindow={false} loadMore={this.loadMore.bind(this)} threshold={100}> initialLoad={false} useWindow={false} loadMore={this.loadMore.bind(this)} threshold={100}>
<NgShow className="container" cond={!!this.state.is_search || !this.state.loading}> <NgShow className="container" cond={!!this.state.is_search || !this.state.loading}>
<NgIf cond={this.state.path === "/"}> <NgIf cond={this.state.path === "/" && CONFIG["hide_menubar"] === false}>
<FrequentlyAccess files={this.state.frequents} /> <FrequentlyAccess files={this.state.frequents} />
</NgIf> </NgIf>
<Submenu path={this.state.path} sort={this.state.sort} view={this.state.view} onSearch={this.onSearch.bind(this)} onViewUpdate={(value) => this.onView(value)} onSortUpdate={(value) => this.onSort(value)} accessRight={this.state.metadata || {}} selected={this.state.selected}></Submenu> <Submenu path={this.state.path} sort={this.state.sort} view={this.state.view} onSearch={this.onSearch.bind(this)} onViewUpdate={(value) => this.onView(value)} onSortUpdate={(value) => this.onSort(value)} accessRight={this.state.metadata || {}} selected={this.state.selected}></Submenu>

40
server/common/config.go
View File

@ -349,28 +349,28 @@ func (this Configuration) Save() Configuration {
func (this Configuration) Export() interface{} { func (this Configuration) Export() interface{} {
return struct { return struct {
Editor string `json:"editor"` Editor string `json:"editor"`
ForkButton bool `json:"fork_button"` ForkButton bool `json:"fork_button"`
DisplayHidden bool `json:"display_hidden"` DisplayHidden bool `json:"display_hidden"`
AutoConnect bool `json:"auto_connect"` AutoConnect bool `json:"auto_connect"`
Name string `json:"name"` Name string `json:"name"`
UploadButton bool `json:"upload_button"` UploadButton bool `json:"upload_button"`
Connections interface{} `json:"connections"` Connections interface{} `json:"connections"`
EnableShare bool `json:"enable_share"` EnableShare bool `json:"enable_share"`
Logout string `json:"logout"` Logout string `json:"logout"`
MimeTypes map[string]string `json:"mime"` MimeTypes map[string]string `json:"mime"`
UploadPoolSize int `json:"upload_pool_size"` UploadPoolSize int `json:"upload_pool_size"`
}{ }{
Editor: this.Get("general.editor").String(), Editor: this.Get("general.editor").String(),
ForkButton: this.Get("general.fork_button").Bool(), ForkButton: this.Get("general.fork_button").Bool(),
DisplayHidden: this.Get("general.display_hidden").Bool(), DisplayHidden: this.Get("general.display_hidden").Bool(),
AutoConnect: this.Get("general.auto_connect").Bool(), AutoConnect: this.Get("general.auto_connect").Bool(),
Name: this.Get("general.name").String(), Name: this.Get("general.name").String(),
UploadButton: this.Get("general.upload_button").Bool(), UploadButton: this.Get("general.upload_button").Bool(),
Connections: this.Conn, Connections: this.Conn,
EnableShare: this.Get("features.share.enable").Bool(), EnableShare: this.Get("features.share.enable").Bool(),
Logout: this.Get("general.logout").String(), Logout: this.Get("general.logout").String(),
MimeTypes: AllMimeTypes(), MimeTypes: AllMimeTypes(),
UploadPoolSize: this.Get("general.upload_pool_size").Int(), UploadPoolSize: this.Get("general.upload_pool_size").Int(),
} }
} }