Skip to content

Commit

Permalink
[Genomic Browser] UserSiteMatch fix (#8468)
Browse files Browse the repository at this point in the history 
Fix a Fatal error on the Genomic Browser tabs: [ERROR] Can not implement UserSiteMatch on a resource type that has no sites.

Fixes #7589
  • Loading branch information
@laemtl
laemtl committed Mar 22, 2023
1 parent c500dc1 commit ae2975e
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 38 deletions.
19 changes: 11 additions & 8 deletions modules/genomic_browser/php/models/cnvdto.class.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ declare(strict_types=1);

namespace LORIS\genomic_browser\Models;

use \LORIS\Data\DataInstance;
use \LORIS\StudyEntities\SiteHaver;

/**
* A CnvDTO represents an CNV in the genomic browser module.
* It is doing the mapping between the profile table columns
Expand All @@ -16,9 +19,9 @@ namespace LORIS\genomic_browser\Models;
* @author Xavier Lecours <xavier.lecours@mcin.ca>
* Alizée Wickenheiser <alizee.wickenheiser@mcin.ca>
* @license http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
* @link https://github.com/aces/Loris-Trunk
* @link https://github.com/aces/Loris
*/
class CnvDTO implements \LORIS\Data\DataInstance
class CnvDTO implements DataInstance, SiteHaver
{
/**
* The centerID
Expand Down Expand Up @@ -248,20 +251,20 @@ class CnvDTO implements \LORIS\Data\DataInstance
/**
* Returns the CenterID for this row
*
* @return integer The CenterID
* @return \CenterID The CenterID
*/
public function getCenterID(): int
public function getCenterID(): \CenterID
{
return (int) $this->_centerID;
return new \CenterID(strval($this->_centerID));
}

/**
* Returns the ProjectID for this row
*
* @return integer The ProjectID
* @return \ProjectID The ProjectID
*/
public function getProjectID(): int
public function getProjectID(): \ProjectID
{
return (int) $this->_projectID;
return new \ProjectID(strval($this->_projectID));
}
}
6 changes: 4 additions & 2 deletions modules/genomic_browser/php/models/filesdto.class.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ declare(strict_types=1);

namespace LORIS\genomic_browser\Models;

use \LORIS\Data\DataInstance;

/**
* A FilesDTO represents an Files in the genomic browser module.
* It is doing the mapping between the profile table columns
Expand All @@ -16,9 +18,9 @@ namespace LORIS\genomic_browser\Models;
* @author Xavier Lecours <xavier.lecours@mcin.ca>
* Alizée Wickenheiser <alizee.wickenheiser@mcin.ca>
* @license http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
* @link https://github.com/aces/Loris-Trunk
* @link https://github.com/aces/Loris
*/
class FilesDTO implements \LORIS\Data\DataInstance
class FilesDTO implements DataInstance
{
/**
* The GenomicFileID
Expand Down
8 changes: 5 additions & 3 deletions modules/genomic_browser/php/models/gwasdto.class.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@
* @author Xavier Lecours <xavier.lecours@mcin.ca>
* Alizée Wickenheiser <alizee.wickenheiser@mcin.ca>
* @license http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
* @link https://github.com/aces/Loris-Trunk
* @link https://github.com/aces/Loris
*/

namespace LORIS\genomic_browser\Models;

use \LORIS\Data\DataInstance;

/**
* A GwasDTO represents an GWAS in the genomic browser module.
* It is doing the mapping between the profile table columns
Expand All @@ -25,9 +27,9 @@ namespace LORIS\genomic_browser\Models;
* @author Xavier Lecours <xavier.lecours@mcin.ca>
* Alizée Wickenheiser <alizee.wickenheiser@mcin.ca>
* @license http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
* @link https://github.com/aces/Loris-Trunk
* @link https://github.com/aces/Loris
*/
class GwasDTO implements \LORIS\Data\DataInstance
class GwasDTO implements DataInstance
{
/**
* The SNP_ID
Expand Down
19 changes: 11 additions & 8 deletions modules/genomic_browser/php/models/methylationdto.class.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ declare(strict_types=1);

namespace LORIS\genomic_browser\Models;

use \LORIS\Data\DataInstance;
use \LORIS\StudyEntities\SiteHaver;

/**
* A MethylationDTO represents an Methylation in the genomic browser module.
* It is doing the mapping between the profile table columns
Expand All @@ -16,9 +19,9 @@ namespace LORIS\genomic_browser\Models;
* @author Xavier Lecours <xavier.lecours@mcin.ca>
* Alizée Wickenheiser <alizee.wickenheiser@mcin.ca>
* @license http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
* @link https://github.com/aces/Loris-Trunk
* @link https://github.com/aces/Loris
*/
class MethylationDTO implements \LORIS\Data\DataInstance
class MethylationDTO implements DataInstance, SiteHaver
{
/**
* The centerID
Expand Down Expand Up @@ -312,20 +315,20 @@ class MethylationDTO implements \LORIS\Data\DataInstance
/**
* Returns the CenterID for this row
*
* @return integer The CenterID
* @return \CenterID The CenterID
*/
public function getCenterID(): int
public function getCenterID(): \CenterID
{
return (int) $this->_centerID;
return new \CenterID(strval($this->_centerID));
}

/**
* Returns the ProjectID for this row
*
* @return integer The ProjectID
* @return \ProjectID The ProjectID
*/
public function getProjectID(): int
public function getProjectID(): \ProjectID
{
return (int) $this->_projectID;
return new \ProjectID(strval($this->_projectID));
}
}
21 changes: 12 additions & 9 deletions modules/genomic_browser/php/models/profiledto.class.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@
* @author Xavier Lecours <xavier.lecours@mcin.ca>
* Alizée Wickenheiser <alizee.wickenheiser@mcin.ca>
* @license http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
* @link https://github.com/aces/Loris-Trunk
* @link https://github.com/aces/Loris
*/

namespace LORIS\genomic_browser\Models;

use \LORIS\Data\DataInstance;
use \LORIS\StudyEntities\SiteHaver;

/**
* A ProfileDTO represents an profile in the genomic browser module.
* It is doing the mapping between the profile table columns
Expand All @@ -25,9 +28,9 @@ namespace LORIS\genomic_browser\Models;
* @author Xavier Lecours <xavier.lecours@mcin.ca>
* Alizée Wickenheiser <alizee.wickenheiser@mcin.ca>
* @license http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
* @link https://github.com/aces/Loris-Trunk
* @link https://github.com/aces/Loris
*/
class ProfileDTO implements \LORIS\Data\DataInstance
class ProfileDTO implements DataInstance, SiteHaver
{

/**
Expand Down Expand Up @@ -146,20 +149,20 @@ class ProfileDTO implements \LORIS\Data\DataInstance
/**
* Returns the CenterID for this row
*
* @return integer The CenterID
* @return \CenterID The CenterID
*/
public function getCenterID(): int
public function getCenterID(): \CenterID
{
return (int) $this->_centerID;
return new \CenterID(strval($this->_centerID));
}

/**
* Returns the ProjectID for this row
*
* @return integer The ProjectID
* @return \ProjectID The ProjectID
*/
public function getProjectID(): int
public function getProjectID(): \ProjectID
{
return (int) $this->_projectID;
return new \ProjectID(strval($this->_projectID));
}
}
19 changes: 11 additions & 8 deletions modules/genomic_browser/php/models/snpdto.class.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@
* @author Xavier Lecours <xavier.lecours@mcin.ca>
* Alizée Wickenheiser <alizee.wickenheiser@mcin.ca>
* @license http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
* @link https://github.com/aces/Loris-Trunk
* @link https://github.com/aces/Loris
*/

namespace LORIS\genomic_browser\Models;

use \LORIS\Data\DataInstance;
use \LORIS\StudyEntities\SiteHaver;

/**
* A SnpDTO represents an SNP in the genomic browser module.
* It is doing the mapping between the profile table columns
Expand All @@ -27,7 +30,7 @@ namespace LORIS\genomic_browser\Models;
* @license http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
* @link https://github.com/aces/Loris-Trunk
*/
class SnpDTO implements \LORIS\Data\DataInstance
class SnpDTO implements DataInstance, SiteHaver
{
/**
* The centerID
Expand Down Expand Up @@ -297,20 +300,20 @@ class SnpDTO implements \LORIS\Data\DataInstance
/**
* Returns the CenterID for this row
*
* @return integer The CenterID
* @return \CenterID The CenterID
*/
public function getCenterID(): int
public function getCenterID(): \CenterID
{
return (int) $this->_centerID;
return new \CenterID(strval($this->_centerID));
}

/**
* Returns the ProjectID for this row
*
* @return integer The ProjectID
* @return \ProjectID The ProjectID
*/
public function getProjectID(): int
public function getProjectID(): \ProjectID
{
return (int) $this->_projectID;
return new \ProjectID(strval($this->_projectID));
}
}

0 comments on commit ae2975e

Please sign in to comment.