beenull/sftpgo-mirror
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2024-11-25 17:10:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

WebClient: use flatpickr as time picker

Browse source 
Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino 2023-11-22 20:14:49 +01:00
parent bde5713ed6
commit 62854e4802
No known key found for this signature in database
GPG key ID: 935D2952DEC4EECF
4 changed files with 57 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/httpd/webclient.go
View file

@ -1353,6 +1353,8 @@ func (s *httpdServer) handleClientAddShareGet(w http.ResponseWriter, r *http.Req
share := &dataprovider.Share{Scope: dataprovider.ShareScopeRead} share := &dataprovider.Share{Scope: dataprovider.ShareScopeRead}
if user.Filters.DefaultSharesExpiration > 0 { if user.Filters.DefaultSharesExpiration > 0 {
share.ExpiresAt = util.GetTimeAsMsSinceEpoch(time.Now().Add(24 * time.Hour * time.Duration(user.Filters.DefaultSharesExpiration))) share.ExpiresAt = util.GetTimeAsMsSinceEpoch(time.Now().Add(24 * time.Hour * time.Duration(user.Filters.DefaultSharesExpiration)))
} else {
share.ExpiresAt = util.GetTimeAsMsSinceEpoch(time.Now().Add(24 * time.Hour * 7))
} }
dirName := "/" dirName := "/"
if _, ok := r.URL.Query()["path"]; ok { if _, ok := r.URL.Query()["path"]; ok {

2
static/assets/plugins/global/plugins.bundle.css
View file

File diff suppressed because one or more lines are too long

50
static/assets/plugins/global/plugins.bundle.js
View file

File diff suppressed because one or more lines are too long

47
templates/webclient/share.html
View file

@ -128,16 +128,14 @@ explicit grant from the SFTPGo Team (support@sftpgo.com).
<div class="form-group row mt-10"> <div class="form-group row mt-10">
<label class="col-md-3 col-form-label">Expiration</label> <label class="col-md-3 col-form-label">Expiration</label>
<div class="col-md-9"> <div class="col-md-9 d-flex">
<div class="input-group" data-td-target-input="nearest" data-td-target-toggle="nearest"> <input id="id_expiration" class="form-control" placeholder="Pick an expiration date" />
<input id="id_expiration" type="text" class="form-control" data-td-target="#id_expiration" /> <button class="btn btn-icon btn-light-danger ms-2 d-none" id="id_expiration_clear">
<span class="input-group-text" data-td-target="#id_expiration" data-td-toggle="datetimepicker"> <i class="ki-duotone ki-cross fs-1">
<i class="ki-duotone ki-calendar fs-2">
<span class="path1"></span> <span class="path1"></span>
<span class="path2"></span> <span class="path2"></span>
</i> </i>
</span> </button>
</div>
</div> </div>
</div> </div>
@ -194,28 +192,39 @@ explicit grant from the SFTPGo Team (support@sftpgo.com).
initRepeater('#paths'); initRepeater('#paths');
initRepeaterItems(); initRepeaterItems();
const picker = new tempusDominus.TempusDominus(document.getElementById("id_expiration"), { const picker = $('#id_expiration').flatpickr({
localization: { enableTime: false,
format: 'yyyy-MM-dd HH:mm' time_24hr: true,
dateFormat: "Y-m-d",
defaultHour: 23,
defaultMinute: 59,
onChange: function(selectedDates, dateStr, instance) {
if (selectedDates.length > 0){
$('#id_expiration_clear').removeClass("d-none");
} else {
$('#id_expiration_clear').addClass("d-none");
}
} }
}); });
//{{ if gt .Share.ExpiresAt 0 }} //{{ if gt .Share.ExpiresAt 0 }}
let input_dt = moment('{{.Share.ExpiresAt }}', 'x').toDate(); let input_dt = moment('{{.Share.ExpiresAt }}', 'x').format('YYYY-MM-DD');
picker.dates.setValue(tempusDominus.DateTime.convert(input_dt)); picker.setDate(input_dt, true);
//{{ end }} //{{ end }}
$('#id_expiration_clear').on("click", function(e){
e.preventDefault();
picker.clear();
});
$("#share_form").submit(function (event) { $("#share_form").submit(function (event) {
let dt = $('#id_expiration').val(); $('#hidden_start_datetime').val("");
if (dt) { let dt = picker.selectedDates;
let d = picker.viewDate; if (dt.length > 0) {
let d = dt[0];
if (d) { if (d) {
let dateString = moment.utc(d).format('YYYY-MM-DD HH:mm:ss'); let dateString = moment.utc(d).format('YYYY-MM-DD HH:mm:ss');
$('#hidden_start_datetime').val(dateString); $('#hidden_start_datetime').val(dateString);
} else {
$('#hidden_start_datetime').val("");
} }
} else {
$('#hidden_start_datetime').val("");
} }
let submitButton = document.querySelector('#form_submit'); let submitButton = document.querySelector('#form_submit');
submitButton.setAttribute('data-kt-indicator', 'on'); submitButton.setAttribute('data-kt-indicator', 'on');