task priority, comments
This commit is contained in:
@ -4,6 +4,7 @@ namespace backend\modules\task\controllers;
|
||||
|
||||
use backend\modules\project\models\ProjectUser;
|
||||
use backend\modules\task\models\ProjectTaskUser;
|
||||
use common\classes\Debug;
|
||||
use yii\data\ActiveDataProvider;
|
||||
use yii\web\Response;
|
||||
use Yii;
|
||||
@ -61,7 +62,7 @@ class TaskController extends Controller
|
||||
{
|
||||
$model = $this->findModel($id);
|
||||
$taskDataProvider = new ActiveDataProvider([
|
||||
'query' => $model->getTaskUsers()->with(['task', 'projectUser']),
|
||||
'query' => \common\models\ProjectTaskUser::find()->where(['task_id' => $id])->with(['user']),
|
||||
'pagination' => [
|
||||
'pageSize' => 20,
|
||||
],
|
||||
|
@ -57,6 +57,8 @@ use yii\widgets\ActiveForm;
|
||||
|
||||
<?= $form->field($model, 'description')->textarea(['rows' => '6']) ?>
|
||||
|
||||
<?= $form->field($model, 'priority')->input('number') ?>
|
||||
|
||||
<div class="form-group">
|
||||
<?= Html::submitButton('Создать', ['class' => 'btn btn-success']) ?>
|
||||
</div>
|
||||
|
@ -54,13 +54,18 @@ YiiAsset::register($this);
|
||||
'attribute' => 'user_id',
|
||||
'value' => ArrayHelper::getValue($model, 'user.userCard.fio'),
|
||||
],
|
||||
[
|
||||
'attribute' => 'executor_id',
|
||||
'value' => ArrayHelper::getValue($model, 'executor.userCard.fio'),
|
||||
],
|
||||
'description',
|
||||
'priority',
|
||||
],
|
||||
]) ?>
|
||||
|
||||
<div>
|
||||
<h2>
|
||||
<?= 'Исполнители' ?>
|
||||
<?= 'Участники' ?>
|
||||
</h2>
|
||||
</div>
|
||||
|
||||
@ -71,7 +76,7 @@ YiiAsset::register($this);
|
||||
|
||||
[
|
||||
'attribute' => 'project_user_id',
|
||||
'value' => 'projectUser.card.fio'
|
||||
'value' => 'user.email'
|
||||
],
|
||||
|
||||
[
|
||||
|
Reference in New Issue
Block a user