Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WebUI: Fix display of time values #2876

Merged
merged 1 commit into from
Sep 5, 2023
Merged

WebUI: Fix display of time values #2876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
- Bump webpack from 5.75.0 to 5.76.0 in /gerbera-web
- Bump word-wrap from 1.2.3 to 1.2.4 in /gerbera-web
- Config WebUI: Catch up with all config changes
- Config: Add support for time specifications
- Config: Generate Example Configuration
- Database items sorting case insensitive
- DB rework playstatus save
Expand All @@ -40,6 +41,7 @@
- Update to latest npm packages
- Update versions of exiv2, fmt, spdlog, googletest and taglib
- Use new ffmpeg channel layout API
- WebUI: Database View - don't allow deleting dynamic containers
- WebUI: Update JS libs
- WebUI: Update popper to 2.11.6 / Update MD5 to 2.19.0

Expand Down
4 changes: 2 additions & 2 deletions src/web/config_load.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,15 +596,15 @@ void Web::ConfigLoad::process()

item = values.append_child("item");
createItem(item, ascs->getItemPath(i, ATTR_AUTOSCAN_DIRECTORY_INTERVAL), ascs->option, ATTR_AUTOSCAN_DIRECTORY_INTERVAL);
setValue(item, adir->getInterval());
setValue(item, adir->getInterval().count());

item = values.append_child("item");
createItem(item, ascs->getItemPath(i, ATTR_AUTOSCAN_DIRECTORY_RECURSIVE), ascs->option, ATTR_AUTOSCAN_DIRECTORY_RECURSIVE);
setValue(item, adir->getRecursive());

item = values.append_child("item");
createItem(item, ascs->getItemPath(i, ATTR_AUTOSCAN_DIRECTORY_MEDIATYPE), ascs->option, ATTR_AUTOSCAN_DIRECTORY_MEDIATYPE);
setValue(item, adir->getMediaType());
setValue(item, AutoscanDirectory::mapMediaType(adir->getMediaType()));

item = values.append_child("item");
createItem(item, ascs->getItemPath(i, ATTR_AUTOSCAN_DIRECTORY_HIDDENFILES), ascs->option, ATTR_AUTOSCAN_DIRECTORY_HIDDENFILES);
Expand Down
7 changes: 5 additions & 2 deletions web/js/jquery.gerbera.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ $.widget('grb.config', {
case 'String':
case 'Password':
case 'Path':
case 'Time':
case 'Enum':
case 'Number': {
itemValue.value = itemValue.editor.val();
Expand Down Expand Up @@ -165,7 +166,8 @@ $.widget('grb.config', {
}
case 'String':
case 'Password':
case 'Number': {
case 'Number':
case 'Time': {
itemValue.value = itemValue.editor.val();
break;
}
Expand Down Expand Up @@ -498,7 +500,8 @@ $.widget('grb.config', {
input.hide();
}
break;
case 'Number': {
case 'Number':
case 'Time': {
input.attr('type', 'number');
input.val(itemValue.value);
}
Expand Down