apuc/guild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed the creator for tasks from project_user to user, fixed api, documentation, filters, some other fixes

Browse Source
This commit is contained in:
iIronside
2021-12-06 15:13:31 +03:00
parent daae8b16b6
commit e78ff7d779
23 changed files with 6024 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
backend/modules/task/controllers/TaskController.php
View File

@ -137,25 +137,4 @@ class TaskController extends Controller
throw new NotFoundHttpException('The requested page does not exist.');
}
public function actionCreator()
{
Yii::$app->response->format = Response::FORMAT_JSON;
if (isset($_POST['depdrop_parents'])) {
$parents = $_POST['depdrop_parents'];
if ($parents != null) {
$project_id = $parents[0];
$users = ProjectUser::usersByProjectArr($project_id);
$formattedUsersArr = array();
foreach ($users as $key => $value){
$formattedUsersArr[] = array('id' => $key, 'name' => $value);
}
return ['output'=>$formattedUsersArr, 'selected'=>''];
}
}
return ['output'=>'', 'selected'=>''];
}
}

44
backend/modules/task/controllers/TaskUserController.php
View File

@ -64,16 +64,42 @@ class TaskUserController extends Controller
* If creation is successful, the browser will be redirected to the 'view' page.
* @return mixed
*/
public function actionCreate()
public function actionCreate($task_id = null)
{
$model = new TaskUser();
if ($model->load(Yii::$app->request->post()) && $model->save()) {
if ($task_id !== null)
{
return $this->redirect(['task/view', 'id' => $task_id]);
}
return $this->redirect(['view', 'id' => $model->id]);
}
return $this->render('create', [
'model' => $model,
'task_id' => $task_id,
]);
}
/**
* Creates a new TaskUser model.
* If creation is successful, the browser will be redirected to the 'view' page.
* @return mixed
*/
public function actionCreateForCurrentTask($task_id = null)
{
$model = new TaskUser();
if ($model->load(Yii::$app->request->post()) && $model->save()) {
return $this->redirect(['task/view', 'id' => $task_id]);
}
return $this->render('create_for_current_task', [
'model' => $model,
'task_id' => $task_id,
]);
}
@ -84,16 +110,23 @@ class TaskUserController extends Controller
* @return mixed
* @throws NotFoundHttpException if the model cannot be found
*/
public function actionUpdate($id)
public function actionUpdate($id, $task_id = null)
{
$model = $this->findModel($id);
if ($model->load(Yii::$app->request->post()) && $model->save()) {
if ($task_id !== null)
{
return $this->redirect(['task/view', 'id' => $task_id]);
}
return $this->redirect(['view', 'id' => $model->id]);
}
return $this->render('update', [
'model' => $model,
'task_id' => $task_id === null ? $model->task_id: $task_id,
]);
}
@ -104,10 +137,15 @@ class TaskUserController extends Controller
* @return mixed
* @throws NotFoundHttpException if the model cannot be found
*/
public function actionDelete($id)
public function actionDelete($id, $task_id = null)
{
$this->findModel($id)->delete();
if ($task_id !== null)
{
return $this->redirect(['task/view', 'id' => $task_id]);
}
return $this->redirect(['index']);
}