Skip to content

Commit 8f9231b

Browse files
authored
Merge branch 'main' into TranslateUserAccounts
2 parents fb5c7a2 + 513d8ac commit 8f9231b

File tree

129 files changed

+14470
-6730
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+14470
-6730
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ modules/*/js/.module-cache/
2626
htdocs/js/components/.module-cache/
2727
node_modules/
2828
modules/*/js/*.map
29+
**/LC_MESSAGES/*.json
2930
htdocs/js/components/*.map
3031
npm-debug.log*
3132
SQL/Archive/autogenerated/reversion/*.sql

CHANGELOG.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,40 @@ core section.***
88
- ***When possible please provide the number of the pull request(s) containing the
99
changes in the following format: PR #1234***
1010

11+
## LORIS 27.x (Release Date: TBD)
12+
### Core
13+
#### Summary
14+
- Minor release after v27 release
15+
### Notes For Existing Projects
16+
17+
Upgrading LORIS requires following the upgrade process each major and minor release (bug fix releases can be script) to ensure the schema is up to date.
18+
19+
For upgrading to 27.x from 27:
20+
- Run the `tools/single_use/27_Publication_Collaborators_Into_New_Entries.php` to move publication collaborators into their own database entries rather than relying on eachother.
21+
22+
## LORIS 27.0 (Release Date: 2025-06-20)
23+
### Core
24+
#### Summary
25+
The LORIS 27 release adds many new features and optimizations detailed below such as:
26+
- Optimizations for the new dataquery tool which also optimize various components throughout LORIS
27+
- Improvements to permission handling through different modules
28+
- A new "Batch Mode" for the issue tracker
29+
- The CandID in LORIS is now 10 digits instead of 6 to support larger projects
30+
- Foreign Key references to the `candidate` table are now standardized: `CandidateID` which refers to `candidate`.`ID`
31+
- Instrument's `flag`.`data` moved to `instrument_data` table
32+
- LORIS now has the ability to display summary statistics of the LORIS instance (either from an SQL query or a query built with the new data query tool) on the login page.
33+
- A new redcap module allows to importing of data from redcap into LORIS
34+
- Various other bug fixes and features detailed below
35+
36+
### Notes For Existing Projects
37+
38+
Upgrading LORIS requires following the upgrade process each major and minor release (bug fix releases can be script) to ensure the schema is up to date.
39+
40+
For upgrading to 27 from 26:
41+
- Source the `SQL/Release_patches/26.0_To_27.0_upgrade.sql`
42+
- Run the `tools/update_issues_with_description.php` to back-populate the new issue tracker description column. (The description was previously based on the first comment.)
43+
44+
1145
## LORIS 26.0 (Release Date: 2024-06-13)
1246
### Core
1347
#### Features

Makefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ locales:
8989
msgfmt -o modules/candidate_list/locale/hi/LC_MESSAGES/candidate_list.mo modules/candidate_list/locale/hi/LC_MESSAGES/candidate_list.po
9090
npx i18next-conv -l hi -s modules/candidate_list/locale/hi/LC_MESSAGES/candidate_list.po -t modules/candidate_list/locale/hi/LC_MESSAGES/candidate_list.json
9191
msgfmt -o modules/candidate_parameters/locale/ja/LC_MESSAGES/candidate_parameters.mo modules/candidate_parameters/locale/ja/LC_MESSAGES/candidate_parameters.po
92+
npx i18next-conv -l ja -s modules/candidate_parameters/locale/ja/LC_MESSAGES/candidate_parameters.po -t modules/candidate_parameters/locale/ja/LC_MESSAGES/candidate_parameters.json
9293
msgfmt -o modules/candidate_profile/locale/ja/LC_MESSAGES/candidate_profile.mo modules/candidate_profile/locale/ja/LC_MESSAGES/candidate_profile.po
9394
msgfmt -o modules/configuration/locale/ja/LC_MESSAGES/configuration.mo modules/configuration/locale/ja/LC_MESSAGES/configuration.po
9495
msgfmt -o modules/configuration/locale/ja/LC_MESSAGES/configuration.mo modules/configuration/locale/ja/LC_MESSAGES/configuration.po
@@ -133,6 +134,10 @@ locales:
133134
msgfmt -o modules/media/locale/ja/LC_MESSAGES/media.mo modules/media/locale/ja/LC_MESSAGES/media.po
134135
msgfmt -o modules/module_manager/locale/ja/LC_MESSAGES/module_manager.mo modules/module_manager/locale/ja/LC_MESSAGES/module_manager.po
135136
msgfmt -o modules/mri_violations/locale/ja/LC_MESSAGES/mri_violations.mo modules/mri_violations/locale/ja/LC_MESSAGES/mri_violations.po
137+
msgfmt -o modules/my_preferences/locale/hi/LC_MESSAGES/my_preferences.mo modules/my_preferences/locale/hi/LC_MESSAGES/my_preferences.po
138+
npx i18next-conv -l ja -s modules/my_preferences/locale/ja/LC_MESSAGES/my_preferences.po -t modules/my_preferences/locale/ja/LC_MESSAGES/my_preferences.json --compatibilityJSON v4
139+
npx i18next-conv -l hi -s modules/my_preferences/locale/hi/LC_MESSAGES/my_preferences.po -t modules/my_preferences/locale/hi/LC_MESSAGES/my_preferences.json --compatibilityJSON v4
140+
msgfmt -o modules/my_preferences/locale/ja/LC_MESSAGES/my_preferences.mo modules/my_preferences/locale/ja/LC_MESSAGES/my_preferences.po
136141
msgfmt -o modules/next_stage/locale/ja/LC_MESSAGES/next_stage.mo modules/next_stage/locale/ja/LC_MESSAGES/next_stage.po
137142
msgfmt -o modules/next_stage/locale/es/LC_MESSAGES/next_stage.mo modules/next_stage/locale/es/LC_MESSAGES/next_stage.po
138143
msgfmt -o modules/oidc/locale/ja/LC_MESSAGES/oidc.mo modules/oidc/locale/ja/LC_MESSAGES/oidc.po
@@ -197,3 +202,8 @@ server_processes_manager: modules/server_processes_manager/locale/ja/LC_MESSAGES
197202

198203
conflict_resolver:
199204
target=conflict_resolver npm run compile
205+
206+
my_preferences: modules/my_preferences/locale/ja/LC_MESSAGES/my_preferences.mo modules/my_preferences/locale/hi/LC_MESSAGES/my_preferences.mo
207+
npx i18next-conv -l ja -s modules/my_preferences/locale/ja/LC_MESSAGES/my_preferences.po -t modules/my_preferences/locale/ja/LC_MESSAGES/my_preferences.json --compatibilityJSON v4
208+
npx i18next-conv -l hi -s modules/my_preferences/locale/hi/LC_MESSAGES/my_preferences.po -t modules/my_preferences/locale/hi/LC_MESSAGES/my_preferences.json --compatibilityJSON v4
209+
target=my_preferences npm run compile

SQL/0000-00-00-schema.sql

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ CREATE TABLE `users` (
105105
`Active` enum('Y','N') NOT NULL default 'Y',
106106
`Password_hash` varchar(255) default NULL,
107107
`PasswordChangeRequired` tinyint(1) NOT NULL default 0,
108+
`TOTPSecret` binary(64) DEFAULT NULL,
108109
`Pending_approval` enum('Y','N') default 'Y',
109110
`Doc_Repo_Notifications` enum('Y','N') default 'N',
110111
`language_preference` integer unsigned default NULL,
@@ -293,13 +294,12 @@ CREATE TABLE `flag` (
293294
`ID` int(10) unsigned NOT NULL auto_increment,
294295
`SessionID` int(10) unsigned NOT NULL,
295296
`TestID` int(10) unsigned NOT NULL,
296-
`CommentID` varchar(255) NOT NULL default '',
297+
`CommentID` varchar(255) NOT NULL,
297298
`Data_entry` enum('In Progress','Complete') default NULL,
298299
`Required_elements_completed` enum('Y','N') NOT NULL default 'N',
299300
`Administration` enum('None','Partial','All') default NULL,
300301
`Validity` enum('Questionable','Invalid','Valid') default NULL,
301302
`Exclusion` enum('Fail','Pass') default NULL,
302-
`UserID` varchar(255) default NULL,
303303
`Testdate` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
304304
`DataID` int(10) unsigned default NULL,
305305
PRIMARY KEY (`CommentID`),
@@ -309,12 +309,29 @@ CREATE TABLE `flag` (
309309
KEY `flag_Data_entry` (`Data_entry`),
310310
KEY `flag_Validity` (`Validity`),
311311
KEY `flag_Administration` (`Administration`),
312-
KEY `flag_UserID` (`UserID`),
313312
CONSTRAINT `FK_flag_1` FOREIGN KEY (`SessionID`) REFERENCES `session` (`ID`) ON DELETE CASCADE ON UPDATE CASCADE,
314313
CONSTRAINT `FK_flag_3` FOREIGN KEY (`DataID`) REFERENCES `instrument_data` (`ID`),
315314
CONSTRAINT `FK_ibfk_1` FOREIGN KEY (`TestID`) REFERENCES `test_names` (`ID`)
316315
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
317316

317+
CREATE TABLE `flag_editors` (
318+
`userID` int(10) unsigned NOT NULL,
319+
`CommentID` VARCHAR(255) NOT NULL,
320+
`editDate` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
321+
PRIMARY KEY (`userID`,`CommentID`),
322+
KEY `FK_flag_editors_2` (`CommentID`),
323+
CONSTRAINT `FK_flag_editors_2`
324+
FOREIGN KEY (`CommentID`)
325+
REFERENCES `flag` (`CommentID`)
326+
ON DELETE CASCADE
327+
ON UPDATE CASCADE,
328+
CONSTRAINT `FK_flag_editors_1`
329+
FOREIGN KEY (`userID`)
330+
REFERENCES `users` (`ID`)
331+
ON DELETE CASCADE
332+
ON UPDATE CASCADE
333+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
334+
318335
CREATE TABLE `history` (
319336
`id` int(11) NOT NULL auto_increment,
320337
`tbl` varchar(255) NOT NULL default '',
@@ -1204,10 +1221,12 @@ INSERT INTO notification_modules (module_name, operation_type, as_admin, templat
12041221
('document_repository', 'edit', 'N', 'notifier_document_repository_edit.tpl', 'Document Repository: Document Edited'),
12051222
('publication', 'submission', 'N', 'notifier_publication_submission.tpl', 'Publication: Submission Received'),
12061223
('publication', 'review', 'N', 'notifier_publication_review.tpl', 'Publication: Proposal has been reviewed'),
1207-
('publication', 'edit', 'N', 'notifier_publication_edit.tpl', 'Publication: Proposal has been edited');
1224+
('publication', 'edit', 'N', 'notifier_publication_edit.tpl', 'Publication: Proposal has been edited'),
1225+
('issue_tracker', 'create/edit', 'N', 'issue_change.tpl', 'Issue Tracker: All issues created or edited');
12081226

12091227
INSERT INTO notification_modules_services_rel SELECT nm.id, ns.id FROM notification_modules nm JOIN notification_services ns WHERE nm.module_name='document_repository' AND ns.service='email_text';
12101228
INSERT INTO notification_modules_services_rel SELECT nm.id, ns.id FROM notification_modules nm JOIN notification_services ns WHERE nm.module_name='publication' AND ns.service='email_text';
1229+
INSERT INTO notification_modules_services_rel SELECT nm.id, ns.id FROM notification_modules nm JOIN notification_services ns WHERE nm.module_name='issue_tracker' AND ns.service='email_text';
12111230

12121231
-- Transfer Document repository notifications to new system
12131232
INSERT INTO users_notifications_rel SELECT u.ID, nm.id, ns.id FROM users u JOIN notification_modules nm JOIN notification_services ns WHERE nm.module_name='document_repository' AND ns.service='email_text' AND u.Doc_Repo_Notifications='Y';
@@ -2453,7 +2472,6 @@ CREATE TABLE `publication_collaborator` (
24532472
CREATE TABLE `publication` (
24542473
`PublicationID` int(10) unsigned NOT NULL AUTO_INCREMENT,
24552474
`PublicationStatusID` int(2) unsigned NOT NULL default 1,
2456-
`LeadInvestigatorID` int(10) unsigned NOT NULL,
24572475
`UserID` int(10) unsigned NOT NULL,
24582476
`RatedBy` int(10) unsigned,
24592477
`DateProposed` date NOT NULL,
@@ -2467,12 +2485,13 @@ CREATE TABLE `publication` (
24672485
`link` varchar(255) DEFAULT NULL,
24682486
`publishingStatus` enum('In Progress','Published') DEFAULT NULL,
24692487
`project` int(10) unsigned DEFAULT NULL,
2488+
`LeadInvestigator` VARCHAR(255) DEFAULT NULL,
2489+
`LeadInvestigatorEmail` VARCHAR(255) DEFAULT NULL,
24702490
CONSTRAINT `FK_publication_project` FOREIGN KEY (project) REFERENCES Project(ProjectID),
24712491
CONSTRAINT `PK_publication` PRIMARY KEY(`PublicationID`),
24722492
CONSTRAINT `FK_publication_UserID` FOREIGN KEY(`UserID`) REFERENCES `users` (`ID`),
24732493
CONSTRAINT `FK_publication_RatedBy` FOREIGN KEY(`RatedBy`) REFERENCES `users` (`ID`),
24742494
CONSTRAINT `FK_publication_PublicationStatusID` FOREIGN KEY(`PublicationStatusID`) REFERENCES `publication_status` (`PublicationStatusID`),
2475-
CONSTRAINT `FK_publication_LeadInvestigatorID` FOREIGN KEY(`LeadInvestigatorID`) REFERENCES `publication_collaborator` (`PublicationCollaboratorID`),
24762495
CONSTRAINT `UK_publication_Title` UNIQUE (`Title`)
24772496
) ENGINE=InnoDB DEFAULT CHARSET='utf8';
24782497

@@ -2688,4 +2707,4 @@ CREATE TABLE `redcap_notification` (
26882707
`handled_dt` datetime NULL,
26892708
PRIMARY KEY (`id`),
26902709
KEY `i_redcap_notif_received_dt` (`received_dt`)
2691-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2710+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

SQL/0000-00-03-ConfigTables.sql

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ CREATE TABLE `Config` (
4848
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, Label, OrderNumber) VALUES ('study', 'Settings related to details of the study', 1, 0, 'Study', 1);
4949
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'title', 'Full descriptive title of the study', 1, 0, 'text', ID, 'Study title', 1 FROM ConfigSettings WHERE Name="study";
5050
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'studylogo', 'Filename containing logo of the study. File should be located under the htdocs/images/ folder', 1, 0, 'text', ID, 'Study logo', 2 FROM ConfigSettings WHERE Name="study";
51+
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'login_logo_left', 'Path for top left logo on the login page.', 1, 0, 'text', ID, 'Login Top Left Logo', 3 FROM ConfigSettings WHERE Name="study";
52+
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'login_logo_right', 'Path for top right logo on the login page.', 1, 0, 'text', ID, 'Login Top Right Logo', 3 FROM ConfigSettings WHERE Name="study";
53+
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'login_logo_left_link', 'Optional link to redirect when clicking on top left logo', 1, 0, 'text', ID, 'Login Top Left Logo Link', 4 FROM ConfigSettings WHERE Name="study";
54+
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'login_logo_right_link', 'Optional link to redirect when clicking on top right logo', 1, 0, 'text', ID, 'Login Top Right Logo Link', 4 FROM ConfigSettings WHERE Name="study";
55+
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'partner_logos', 'Logos for partners to be displayed in the homepage', 1, 1, 'text', ID, 'Partner Logos', 4 FROM ConfigSettings WHERE Name="study";
5156
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'startYear', "Start year for study recruitment or data collection", 1, 0, 'text', ID, 'Start year', 5 FROM ConfigSettings WHERE Name="study";
5257
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'endYear', "End year for study recruitment or data collection", 1, 0, 'text', ID, 'End year', 6 FROM ConfigSettings WHERE Name="study";
5358
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'ageMin', 'Minimum candidate age in years (0+)', 1, 0, 'text', ID, 'Minimum candidate age', 7 FROM ConfigSettings WHERE Name="study";
@@ -204,6 +209,10 @@ INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType,
204209
INSERT INTO Config (ConfigID, Value) SELECT ID, 1 FROM ConfigSettings WHERE Name="additional_user_info";
205210
INSERT INTO Config (ConfigID, Value) SELECT ID, "Example Study" FROM ConfigSettings WHERE Name="title";
206211
INSERT INTO Config (ConfigID, Value) SELECT ID, "<h3>Example Study Description</h3>\r\n <p>This is a sample description for this study, because it is a new LORIS install that has not yet customized this text.</p>\r\n <p>A LORIS administrator can customize this text in the configuration module, under the configuration option labeled \"Study Description\"</p>\r\n <h3>Useful Links</h3>\r\n <ul>\r\n <li><a href=\"https://github.com/aces/Loris\" >LORIS GitHub Repository</a></li>\r\n <li><a href=\"https://github.com/aces/Loris/wiki/Setup\" >LORIS Setup Guide</a></li>\r\n <li><a href=\"https://www.youtube.com/watch?v=2Syd_BUbl5A\" >A video of a loris on YouTube</a></li>\r\n </ul>" FROM ConfigSettings WHERE Name="StudyDescription";
212+
INSERT INTO Config (ConfigID, Value) SELECT ID, "/images/LORIS_logo_white.svg" FROM ConfigSettings WHERE Name="login_logo_left";
213+
INSERT INTO Config (ConfigID, Value) SELECT ID, "/images/github-mark.svg" FROM ConfigSettings WHERE Name="login_logo_right";
214+
INSERT INTO Config (ConfigID, Value) SELECT ID, "/" FROM ConfigSettings WHERE Name="login_logo_left_link";
215+
INSERT INTO Config (ConfigID, Value) SELECT ID, "https://github.com/aces/Loris" FROM ConfigSettings WHERE Name="login_logo_right_link";
207216
INSERT INTO Config (ConfigID, Value) SELECT ID, "images/neurorgb_web.jpg" FROM ConfigSettings WHERE Name="studylogo";
208217
INSERT INTO Config (ConfigID, Value) SELECT ID, "false" FROM ConfigSettings WHERE Name="useEDC";
209218
INSERT INTO Config (ConfigID, Value) SELECT ID, "false" FROM ConfigSettings WHERE Name="useDoB";
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
CREATE TABLE `flag_editors` (
2+
`userID` int(10) unsigned NOT NULL default '0',
3+
`CommentID` VARCHAR(255) NOT NULL default '',
4+
`editDate` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
5+
PRIMARY KEY (`userID`,`CommentID`),
6+
KEY `FK_flag_editors_2` (`CommentID`),
7+
CONSTRAINT `FK_flag_editors_2`
8+
FOREIGN KEY (`CommentID`)
9+
REFERENCES `flag` (`CommentID`)
10+
ON DELETE CASCADE
11+
ON UPDATE CASCADE,
12+
CONSTRAINT `FK_flag_editors_1`
13+
FOREIGN KEY (`userID`)
14+
REFERENCES `users` (`ID`)
15+
ON DELETE CASCADE
16+
ON UPDATE CASCADE
17+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
18+
19+
INSERT INTO flag_editors (userID, CommentID)
20+
SELECT users.ID, CommentID from flag JOIN users ON flag.UserID = users.UserID;
21+
22+
ALTER TABLE flag DROP COLUMN UserID;
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
-- Publication Lead Investigators do not need to be collaborators
2+
ALTER TABLE publication
3+
ADD COLUMN LeadInvestigatorEmail VARCHAR(255) NULL,
4+
ADD COLUMN LeadInvestigator VARCHAR(255) NULL;
5+
6+
UPDATE publication
7+
SET LeadInvestigator = (SELECT Name FROM publication_collaborator WHERE PublicationCollaboratorID = LeadInvestigatorID),
8+
LeadInvestigatorEmail = (SELECT Email FROM publication_collaborator WHERE PublicationCollaboratorID = LeadInvestigatorID)
9+
WHERE LeadInvestigatorID IS NOT NULL;
10+
11+
ALTER TABLE publication
12+
DROP FOREIGN KEY `FK_publication_LeadInvestigatorID`;
13+
14+
ALTER TABLE publication_collaborator
15+
DROP INDEX `UK_publication_collaborator_Email`;
16+
17+
-- Remove the LeadInvestigatorID column from publication
18+
ALTER TABLE publication
19+
DROP COLUMN LeadInvestigatorID;
20+
21+
DELETE FROM publication_collaborator
22+
WHERE PublicationCollaboratorID NOT IN (SELECT PublicationCollaboratorID FROM publication_collaborator_rel);
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE users ADD COLUMN TOTPSecret binary(64) DEFAULT NULL AFTER PasswordChangeRequired;
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) VALUES('login_logo_left', 'Path for top left logo on the login page.', 1, 0, 'text', 1, 'Login Top Left Logo', 3);
2+
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) VALUES('login_logo_right', 'Path for top right logo on the login page.', 1, 0, 'text', 1, 'Login Top Right Logo', 3);
3+
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) VALUES('login_logo_left_link', 'Optional link to redirect when clicking on top left logo', 1, 0, 'text', 1, 'Login Top Left Logo Link', 4);
4+
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) VALUES('login_logo_right_link', 'Optional link to redirect when clicking on top right logo', 1, 0, 'text', 1, 'Login Top Right Logo Link', 4);
5+
INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) VALUES('partner_logos', 'Logos for partners to be displayed in the homepage', 1, 1, 'text', 1, 'Partner Logos', 4);
6+
7+
INSERT INTO Config (ConfigID, Value) VALUES ((SELECT ID FROM ConfigSettings WHERE Name="login_logo_left"), "/images/LORIS_logo_white.svg");
8+
INSERT INTO Config (ConfigID, Value) VALUES ((SELECT ID FROM ConfigSettings WHERE Name="login_logo_right"), "/images/GitHub-Mark-Light-64px.png");
9+
INSERT INTO Config (ConfigID, Value) VALUES ((SELECT ID FROM ConfigSettings WHERE Name="login_logo_left_link"), "/");
10+
INSERT INTO Config (ConfigID, Value) VALUES ((SELECT ID FROM ConfigSettings WHERE Name="login_logo_right_link"), "https://github.com/aces/Loris");
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
SET FOREIGN_KEY_CHECKS = 0;
2+
3+
-- ======================================================
4+
-- Fix `CommentID` in `flag` table
5+
-- ======================================================
6+
ALTER TABLE `flag`
7+
MODIFY `CommentID` VARCHAR(255) NOT NULL;
8+
9+
-- ======================================================
10+
-- Fix `CommentID` and `userID` in `flag_editors` table
11+
-- ======================================================
12+
ALTER TABLE `flag_editors`
13+
MODIFY `CommentID` VARCHAR(255) NOT NULL,
14+
MODIFY `userID` INT(10) UNSIGNED NOT NULL;
15+
16+
SET FOREIGN_KEY_CHECKS = 1;

0 commit comments

Comments
 (0)