Jingga/oms-Tasks
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Tasks.git synced 2026-02-14 05:38:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	Tasks/Admin/Routes/Web/Api.php
This commit is contained in:
Dennis Eichhorn 2016-10-02 12:10:19 +02:00
commit 65e87db2a8
5 changed files with 57 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Admin/Installer.php
View File

@ -69,6 +69,23 @@ class Installer extends InstallerAbstract
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'task_ibfk_2` FOREIGN KEY (`task_created_by`) REFERENCES `' . $dbPool->get('core')->prefix . 'account` (`account_id`);' ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'task_ibfk_2` FOREIGN KEY (`task_created_by`) REFERENCES `' . $dbPool->get('core')->prefix . 'account` (`account_id`);'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare(
'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'task_media` (
`task_media_id` int(11) NOT NULL AUTO_INCREMENT,
`task_media_src` int(11) NULL,
`task_media_dst` int(11) NULL,
PRIMARY KEY (`task_media_id`),
KEY `task_media_src` (`task_media_src`),
KEY `task_media_dst` (`task_media_dst`)
)ENGINE=InnoDB DEFAULT CHARSET=utf8;'
)->execute();
$dbPool->get('core')->con->prepare(
'ALTER TABLE `' . $dbPool->get('core')->prefix . 'task_media`
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'task_media_ibfk_1` FOREIGN KEY (`task_media_src`) REFERENCES `' . $dbPool->get('core')->prefix . 'task` (`task_id`),
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'task_media_ibfk_2` FOREIGN KEY (`task_media_dst`) REFERENCES `' . $dbPool->get('core')->prefix . 'media` (`media_id`);'
)->execute();
$dbPool->get('core')->con->prepare( $dbPool->get('core')->con->prepare(
'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'task_account` ( 'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'task_account` (
`task_account_id` int(11) NOT NULL AUTO_INCREMENT, `task_account_id` int(11) NOT NULL AUTO_INCREMENT,
@ -112,6 +129,23 @@ class Installer extends InstallerAbstract
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'task_element_ibfk_3` FOREIGN KEY (`task_element_forwarded`) REFERENCES `' . $dbPool->get('core')->prefix . 'account` (`account_id`);' ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'task_element_ibfk_3` FOREIGN KEY (`task_element_forwarded`) REFERENCES `' . $dbPool->get('core')->prefix . 'account` (`account_id`);'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare(
'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'task_element_media` (
`task_element_media_id` int(11) NOT NULL AUTO_INCREMENT,
`task_element_media_src` int(11) NULL,
`task_element_media_dst` int(11) NULL,
PRIMARY KEY (`task_element_media_id`),
KEY `task_element_media_src` (`task_element_media_src`),
KEY `task_element_media_dst` (`task_element_media_dst`)
)ENGINE=InnoDB DEFAULT CHARSET=utf8;'
)->execute();
$dbPool->get('core')->con->prepare(
'ALTER TABLE `' . $dbPool->get('core')->prefix . 'task_element_media`
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'task_element_media_ibfk_1` FOREIGN KEY (`task_element_media_src`) REFERENCES `' . $dbPool->get('core')->prefix . 'task_element` (`task_element_id`),
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'task_element_media_ibfk_2` FOREIGN KEY (`task_element_media_dst`) REFERENCES `' . $dbPool->get('core')->prefix . 'media` (`media_id`);'
)->execute();
$dbPool->get('core')->con->commit(); $dbPool->get('core')->con->commit();
break; break;
} }

2
Admin/Routes/Web/Api.php
View File

@ -16,5 +16,3 @@ return [
], ],
], ],
]; ];

2
Models/Task.php
View File

@ -119,6 +119,8 @@ class Task
*/ */
protected $schedule = null; protected $schedule = null;
protected $media = null;
/** /**
* Constructor. * Constructor.
* *

15
Models/TaskElementMapper.php
View File

@ -49,6 +49,21 @@ class TaskElementMapper extends DataMapperAbstract
'task_element_created_at' => ['name' => 'task_element_created_at', 'type' => 'DateTime', 'internal' => 'createdAt'], 'task_element_created_at' => ['name' => 'task_element_created_at', 'type' => 'DateTime', 'internal' => 'createdAt'],
]; ];
/**
* Has many relation.
*
* @var array<string, array>
* @since 1.0.0
*/
protected static $hasMany = [
'media' => [
'mapper' => MediaMapper::class,
'table' => 'task_element_media',
'dst' => 'task_element_media_dst',
'src' => 'task_element_media_src',
],
];
/** /**
* Primary table. * Primary table.
* *

6
Models/TaskMapper.php
View File

@ -68,6 +68,12 @@ class TaskMapper extends DataMapperAbstract
'dst' => 'task_element_task', 'dst' => 'task_element_task',
'src' => null, 'src' => null,
], ],
'media' => [
'mapper' => MediaMapper::class,
'table' => 'task_media',
'dst' => 'task_media_dst',
'src' => 'task_media_src',
],
]; ];
/** /**