luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

UX: Rename "analog" to "scan"

Browse source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2020-07-06 14:35:25 +02:00
parent d1b2b2dc0b
commit 4ddf241a6c
8 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/component/navigation.vue
View file

@ -98,10 +98,10 @@
</v-list-tile-content>
</v-list-tile>
<v-list-tile :to="{name: 'photos', query: { q: 'analog:true' }}" :exact="true" @click="">
<v-list-tile :to="{name: 'photos', query: { q: 'scan:true' }}" :exact="true" @click="">
<v-list-tile-content>
<v-list-tile-title>
<translate key="Analog">Analog</translate>
<translate key="Scans">Scans</translate>
</v-list-tile-title>
</v-list-tile-content>
</v-list-tile>

6
frontend/src/dialog/photo/info.vue
View file

@ -103,14 +103,14 @@
</tr>
<tr>
<td>
<translate key="Analog">Analog</translate>
<translate key="Scan">Scan</translate>
</td>
<td>
<v-switch
@change="save"
hide-details
v-model="model.Analog"
:label="model.Analog ? $gettext('Yes') : $gettext('No')"
v-model="model.Scan"
:label="model.Scan ? $gettext('Yes') : $gettext('No')"
></v-switch>
</td>
</tr>

2
frontend/src/model/photo.js
View file

@ -54,7 +54,7 @@ export class Photo extends RestModel {
Type: TypeImage,
Favorite: false,
Private: false,
Analog: false,
Scan: false,
TakenAt: "",
TakenAtLocal: "",
TakenSrc: "",

2
internal/entity/photo.go
View file

@ -49,7 +49,7 @@ type Photo struct {
OriginalName string `gorm:"type:varbinary(768);" json:"OriginalName" yaml:"OriginalName,omitempty"`
PhotoFavorite bool `json:"Favorite" yaml:"Favorite,omitempty"`
PhotoPrivate bool `json:"Private" yaml:"Private,omitempty"`
PhotoAnalog bool `json:"Analog" yaml:"Analog,omitempty"`
PhotoScan bool `json:"Scan" yaml:"Scan,omitempty"`
TimeZone string `gorm:"type:varbinary(64);" json:"TimeZone" yaml:"-"`
PlaceID string `gorm:"type:varbinary(42);index;" json:"PlaceID" yaml:"-"`
LocationID string `gorm:"type:varbinary(42);index;" json:"LocationID" yaml:"-"`

2
internal/form/photo.go
View file

@ -34,7 +34,7 @@ type Photo struct {
PhotoFavorite bool `json:"Favorite"`
PhotoPrivate bool `json:"Private"`
PhotoReview bool `json:"Review"`
PhotoAnalog bool `json:"Analog"`
PhotoScan bool `json:"Scan"`
LocationID string `json:"LocationID"`
LocationSrc string `json:"LocationSrc"`
GPSAccuracy int `json:"GPSAccuracy"`

2
internal/form/photo_search.go
View file

@ -19,7 +19,7 @@ type PhotoSearch struct {
Primary bool `form:"primary"`
Video bool `form:"video"`
Photo bool `form:"photo"`
Analog bool `form:"analog"`
Scan bool `form:"scan"`
Duplicate bool `form:"duplicate"`
Error bool `form:"error"`
Hidden bool `form:"hidden"`

2
internal/query/photo_results.go
View file

@ -38,7 +38,7 @@ type PhotoResult struct {
PhotoExposure string `json:"Exposure"`
PhotoQuality int `json:"Quality"`
PhotoResolution int `json:"Resolution"`
PhotoAnalog bool `json:"Analog"`
PhotoScan bool `json:"Scan"`
CameraID uint `json:"CameraID"` // Camera
CameraSerial string `json:"CameraSerial"`
CameraSrc string `json:"CameraSrc"`

4
internal/query/photo_search.go
View file

@ -190,8 +190,8 @@ func PhotoSearch(f form.PhotoSearch) (results PhotoResults, count int, err error
s = s.Where("photos.photo_favorite = 1")
}
if f.Analog {
s = s.Where("photos.photo_analog = 1")
if f.Scan {
s = s.Where("photos.photo_scan = 1")
}
if f.Country != "" {