Merge pull request #6095 from ridz1208/PUSH_v21.0.6_INTO_22.0-release

Push v21.0.6 into 22.0 release
aces · Feb 25, 2020 · a1bb788 · a1bb788
2 parents d342d4f + 483fc2a
commit a1bb788
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/SQL/Archive/22.0/2019-11-01-Add_data_release_permissions.sql b/SQL/Archive/22.0/2019-11-01-Add_data_release_permissions.sql
@@ -4,5 +4,11 @@ INSERT INTO permissions (code,description,categoryID) VALUES
 INSERT INTO LorisMenuPermissions (MenuID, PermID)
     SELECT m.ID, p.PermID FROM permissions p CROSS JOIN LorisMenu m WHERE p.code='data_release_view' AND m.Label='Data Release';
 
+INSERT IGNORE INTO LorisMenuPermissions (MenuID, PermID)
+    SELECT m.ID, p.PermID FROM permissions p CROSS JOIN LorisMenu m WHERE p.code='data_release_upload' AND m.Label='Data Release';
+INSERT IGNORE INTO LorisMenuPermissions (MenuID, PermID)
+    SELECT m.ID, p.PermID FROM permissions p CROSS JOIN LorisMenu m WHERE p.code='data_release_edit_file_access' AND m.Label='Data Release';
+
+
 INSERT IGNORE INTO user_perm_rel
 SELECT upr.userID, p.permID FROM user_perm_rel upr JOIN permissions p WHERE upr.permID=1 AND p.code IN ('data_release_view');
diff --git a/SQL/Release_patches/21.0_To_22.0_upgrade.sql b/SQL/Release_patches/21.0_To_22.0_upgrade.sql
@@ -77,6 +77,10 @@ INSERT INTO permissions (code,description,categoryID) VALUES
 
 INSERT INTO LorisMenuPermissions (MenuID, PermID)
     SELECT m.ID, p.PermID FROM permissions p CROSS JOIN LorisMenu m WHERE p.code='data_release_view' AND m.Label='Data Release';
+INSERT IGNORE INTO LorisMenuPermissions (MenuID, PermID)
+    SELECT m.ID, p.PermID FROM permissions p CROSS JOIN LorisMenu m WHERE p.code='data_release_upload' AND m.Label='Data Release';
+INSERT IGNORE INTO LorisMenuPermissions (MenuID, PermID)
+    SELECT m.ID, p.PermID FROM permissions p CROSS JOIN LorisMenu m WHERE p.code='data_release_edit_file_access' AND m.Label='Data Release';
 
 INSERT IGNORE INTO user_perm_rel
 SELECT upr.userID, p.permID FROM user_perm_rel upr JOIN permissions p WHERE upr.permID=1 AND p.code IN ('data_release_view');

diff --git a/tools/CouchDB_MRI_Importer.php b/tools/CouchDB_MRI_Importer.php
@@ -100,12 +100,12 @@ function _generateCandidatesQuery($ScanTypes)
             $Query .= ", (SELECT f.File FROM files f LEFT JOIN mri_scan_type msc
               ON (msc.ID= f.AcquisitionProtocolID)
               WHERE f.SessionID=s.ID AND msc.Scan_type='$scantype' LIMIT 1)
-                    as Selected_$scantype, (SELECT fqc.QCStatus
+                    as `Selected_$scantype`, (SELECT fqc.QCStatus
                     FROM files f 
                     LEFT JOIN files_qcstatus fqc USING(FileID)
                     LEFT JOIN mri_scan_type msc ON(msc.ID= f.AcquisitionProtocolID)
               WHERE f.SessionID=s.ID AND msc.Scan_type='$scantype' LIMIT 1)
-                     as $scantype"."_QCStatus";
+                     as `$scantype"."_QCStatus`";
         }
         $Query .= " FROM session s JOIN candidate c USING (CandID)
             LEFT JOIN feedback_mri_comments fmric