Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Projets publics
Ravada-Mirror
Commits
7aebffee
Commit
7aebffee
authored
Oct 04, 2021
by
Francesc Guasch
Browse files
Merge branch 'develop' of github.com:UPC/ravada into develop
parents
fae1b91d
36bb2f84
Changes
4
Hide whitespace changes
Inline
Side-by-side
dockerfy/dockers/back/Dockerfile
View file @
7aebffee
...
...
@@ -8,7 +8,7 @@ RUN apt-get update \
libdbd-mysql-perl libdbi-perl libdbix-connector-perl libipc-run3-perl libnet-ldap-perl
\
libproc-pid-file-perl libsys-virt-perl libxml-libxml-perl libconfig-yaml-perl
\
libmoose-perl libjson-xs-perl perlmagick libmoosex-types-netaddr-ip-perl libsys-statistics-linux-perl
\
libio-interface-perl
libiptables-chainmgr-perl
libnet-dns-perl liblocale-maketext-lexicon-perl
\
libio-interface-perl libnet-dns-perl liblocale-maketext-lexicon-perl
\
libmojolicious-plugin-i18n-perl libdbd-sqlite3-perl debconf adduser libdigest-sha-perl libnet-ssh2-perl
\
libfile-rsync-perl libdate-calc-perl libparallel-forkmanager-perl libdatetime-perl libencode-locale-perl netcat-openbsd
\
liblwp-useragent-determined-perl libvirt-clients supervisor net-tools openssh-client apt-utils curl libpbkdf2-tiny-perl
\
...
...
dockerfy/dockers/front/Dockerfile
View file @
7aebffee
...
...
@@ -8,7 +8,7 @@ RUN apt-get update \
libdbd-mysql-perl libdbi-perl libdbix-connector-perl libipc-run3-perl libnet-ldap-perl
\
libproc-pid-file-perl libsys-virt-perl libxml-libxml-perl libconfig-yaml-perl
\
libmoose-perl libjson-xs-perl perlmagick libmoosex-types-netaddr-ip-perl libsys-statistics-linux-perl
\
libio-interface-perl
libiptables-chainmgr-perl
libnet-dns-perl liblocale-maketext-lexicon-perl
\
libio-interface-perl libnet-dns-perl liblocale-maketext-lexicon-perl
\
libmojolicious-plugin-i18n-perl libdbd-sqlite3-perl debconf adduser libdigest-sha-perl libnet-ssh2-perl libpbkdf2-tiny-perl
\
libfile-rsync-perl libdate-calc-perl libparallel-forkmanager-perl libdatetime-perl libencode-locale-perl netcat-openbsd
\
libio-stringy-perl libvirt-clients liblwp-useragent-determined-perl supervisor net-tools apt-utils lsof mysql-client
\
...
...
public/js/booking/booking.services.js
View file @
7aebffee
...
...
@@ -9,7 +9,7 @@ export {
svcBookings
.
$inject
=
[
"
$resource
"
];
function
svcBookings
(
$resource
)
{
return
$resource
(
'
/v1/bookings/:id
'
);
return
$resource
(
'
/v1/bookings/:id
_booking
'
);
}
svcEntry
.
$inject
=
[
"
$resource
"
];
...
...
public/js/booking/calendar.component.js
View file @
7aebffee
...
...
@@ -126,7 +126,7 @@ function calendarCtrl($element, $window, apiBookings,$uibModal,moment,apiEntry)
async
function
editEntry
(
eventClickInfo
)
{
// parameter object details in https://fullcalendar.io/docs/eventClick
const
res
=
await
apiEntry
.
get
({
id
:
eventClickInfo
.
event
.
id
}).
$promise
;
const
resBooking
=
await
apiBookings
.
get
({
id
:
eventClickInfo
.
event
.
groupId
}).
$promise
;
const
resBooking
=
await
apiBookings
.
get
({
id
_booking
:
eventClickInfo
.
event
.
groupId
}).
$promise
;
res
.
editable
=
self
.
userId
===
resBooking
.
id_owner
&&
self
.
editable
;
res
.
background_color
=
resBooking
.
background_color
;
res
.
id_owner
=
resBooking
.
id_owner
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment