Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-14 20:33:16 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fixes' into develop

Browse source
This commit is contained in:
Stash Dev 2019-03-23 16:34:10 -07:00
commit aeac58b65c
4 changed files with 65 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
packrd/packed-packr.go
View file

File diff suppressed because one or more lines are too long

2
pkg/models/model_gallery.go
View file

@ -98,7 +98,7 @@ func (g *Gallery) listZipContents() ([]*zip.File, *zip.ReadCloser, error) {
continue
}
ext := filepath.Ext(file.Name)
if ext != ".jpg" && ext != ".png" && ext != ".gif" {
if ext != ".jpg" && ext != ".jpeg" && ext != ".png" && ext != ".gif" {
continue
}
if strings.Contains(file.Name, "__MACOSX") {

7
pkg/models/querybuilder_scene_marker.go
View file

@ -198,7 +198,12 @@ func (qb *SceneMarkerQueryBuilder) Query(sceneMarkerFilter *SceneMarkerFilterTyp
func (qb *SceneMarkerQueryBuilder) getSceneMarkerSort(findFilter *FindFilterType) string {
sort := findFilter.GetSort("title")
direction := findFilter.GetDirection()
return getSort(sort, direction, "scene_markers")
tableName := "scene_markers"
if sort == "scenes_updated_at" {
sort = "updated_at"
tableName = "scene"
}
return getSort(sort, direction, tableName)
}
func (qb *SceneMarkerQueryBuilder) querySceneMarkers(query string, args []interface{}, tx *sqlx.Tx) ([]SceneMarker, error) {

1
ui/v2/src/models/list-filter/filter.ts
View file

@ -122,6 +122,7 @@ export class ListFilterModel {
break;
}
if (!!this.displayMode === false) { this.displayMode = this.displayModeOptions[0]; }
this.sortByOptions = [...this.sortByOptions, "created_at", "updated_at"];
}
public configureFromQueryParameters(rawParms: any) {