nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-31 03:34:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'fsfs/multiple-email' into multiple-email-new

Browse Source
This commit is contained in:
Andrew Ruthven 2021-02-26 00:19:45 +13:00
commit d788bca04a
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dba/appuser_permissions.txt
View File

@ -26,6 +26,7 @@ GRANT SELECT,INSERT,UPDATE,DELETE
ON freebusy_ticket ON freebusy_ticket
ON usr ON usr
ON usr_setting ON usr_setting
ON usr_emails
ON roles ON roles
ON role_member ON role_member
ON session ON session

2
dba/patches/1.3.4.sql
View File

@ -27,7 +27,7 @@ INSERT INTO usr_emails (user_no, email)
SELECT user_no, email FROM usr WHERE email IS NOT NULL AND email <> ''; SELECT user_no, email FROM usr WHERE email IS NOT NULL AND email <> '';
ALTER TABLE usr ALTER TABLE usr
DROP COLUMN email; DROP COLUMN email CASCADE;
-- http://blogs.transparent.com/polish/names-of-the-months-and-their-meaning/ -- http://blogs.transparent.com/polish/names-of-the-months-and-their-meaning/
SELECT new_db_revision(1,3,4, 'Kwiecień' ); SELECT new_db_revision(1,3,4, 'Kwiecień' );

4
inc/ui/principal-edit.php
View File

@ -602,8 +602,8 @@ function email_browser() {
$browser->SetOrdering( 'email', 'A' ); $browser->SetOrdering( 'email', 'A' );
$browser->SetJoins( "usr_emails " ); $browser->SetJoins( "usr_emails LEFT JOIN dav_principal USING(user_no)" );
$browser->SetWhere( 'user_no = '.$id ); $browser->SetWhere( 'principal_id = '.$id );
if ( $c->enable_row_linking ) { if ( $c->enable_row_linking ) {
$browser->RowFormat( '<tr onMouseover="LinkHref(this,1);" title="'.translate('Click to edit email').'" class="r%d">', '</tr>', '#even' ); $browser->RowFormat( '<tr onMouseover="LinkHref(this,1);" title="'.translate('Click to edit email').'" class="r%d">', '</tr>', '#even' );