这是indexloc提供的服务，不要输入任何密码
Skip to content

Updated js for datatables and resource admin view and editor fordescription/notefield #478

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 25 commits into from
Feb 18, 2025
Merged

Updated js for datatables and resource admin view and editor fordescription/notefield #478

merged 25 commits into from
Feb 18, 2025

Conversation

@lucs7
Copy link
Contributor

@lucs7 lucs7 commented Jan 26, 2025

functional changes

  • added wysiwyg editor for description and note in admin view and user view including user input sanitization
  • updated js to work with datatables after pagination (work in progress)
  • reintroduced add button for groupadminrole to admin/groups

layout edits

  • updated qr code presenter to bootstraps
  • updated layout in admin/resources

bug fixes

  • collapse divs in admin/resources

lucs7 added 19 commits January 15, 2025 21:09
@lucs7
updated structure
de1d668
@lucs7
updated manage_resources page to support Datatables pagination
4b47eb2
@lucs7
Updated event handing in schedule.js to work with Datatables
39ae910
@lucs7
update ManageReservation and ManageQuota to work with DataTables
7ddb038
@lucs7
small edit in tpl to sync according state with aria-state
d18abef
@lucs7
Add "group role" change button for groups that are not a GroupAdmin yet
80dd1d5
@lucs7
updated layout of schedule legend layout
a4e4b7d
@lucs7
updated structure
81f6456
@lucs7
changed deledate to on function. restructuring of event callers to wo…
b34720d 
…rk with datatables
@lucs7
add "add" fileld for group admin role
de466b6
@lucs7
renamed table to reservationColorTable
4b064ac
@lucs7
updated js structure. added data element to response
07f6d71
@lucs7
updated translation of "AllResourcesOn" in de-de
7378c3b
@lucs7
updated js structure of group.js
cbbbe8c
@lucs7
added trumbowyg as x-editable type and reformated resourceDetailsPopu…
0008695 
…p to allow for html description and note field
@lucs7
added dompurify to sanatize user input
35761ee
@lucs7
updated qr code presentation with bootstraps
d3da9b5
@lucs7
updated resource admin layout and fixed some collapse div errors
f341dea
@lucs7
Merge pull request #3 from LibreBooking/dev-bootstrap5
dd2e15b 
Dev bootstrap5
labmecanicatec
labmecanicatec suggested changes Jan 28, 2025
View reviewed changes
Copy link
Contributor

@labmecanicatec labmecanicatec left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was repeated .element

labmecanicatec
labmecanicatec suggested changes Jan 28, 2025
View reviewed changes
Copy link
Contributor

@labmecanicatec labmecanicatec left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The route is incorrect

labmecanicatec
labmecanicatec reviewed Jan 28, 2025
View reviewed changes
labmecanicatec
labmecanicatec suggested changes Jan 28, 2025
View reviewed changes
labmecanicatec
labmecanicatec suggested changes Jan 30, 2025
View reviewed changes
@lucs7
Copy link
Contributor Author

lucs7 commented Jan 31, 2025

I updated the resource tpl which now looks as intended.
The ressource color is supposed to be under the image to declutter the properties a bit and use the empty space.

Preferably I would also move the rename, copy and delete buttons over there but I havent found a layout that works

image

labmecanicatec
labmecanicatec suggested changes Jan 31, 2025
View reviewed changes
@lucs7
Copy link
Contributor Author

lucs7 commented Feb 1, 2025

updated. but using bootstraps wouldn't it make more sense to use standard bootstrap classes for the styling? the "resourceName" class is used to trigger the x-editable for the rename button. I relabelled it to "resourceNameField" to resolve the naming conflict.

labmecanicatec
labmecanicatec suggested changes Feb 5, 2025
View reviewed changes
@lucs7
Copy link
Contributor Author

lucs7 commented Feb 8, 2025

done 👍

@labmecanicatec
Copy link
Contributor

labmecanicatec commented Feb 8, 2025

Thanks, I'll check this weekend and if there are no problems we'll request the merge with the main branch

@lucs7 lucs7 requested a review from labmecanicatec February 14, 2025 11:56
@labmecanicatec
Copy link
Contributor

labmecanicatec commented Feb 17, 2025

@effgarces, this PR can be merged into dev-bootstrap5

@effgarces effgarces merged commit d72a8d8 into LibreBooking:dev-bootstrap5 Feb 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@labmecanicatec labmecanicatec Awaiting requested review from labmecanicatec

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@lucs7 @labmecanicatec @effgarces