Browse Source

Merge pull request 'staging' (#122) from staging into master

Reviewed-on: ordo/adw-backend#122
pull/3/head
ibnu 1 year ago
parent
commit
7b0d4f5b40
  1. 6
      app/Http/Controllers/ActivityController.php
  2. 6
      app/Http/Controllers/ShowHideColumnController.php

6
app/Http/Controllers/ActivityController.php

@ -462,8 +462,12 @@ class ActivityController extends Controller
do { do {
array_pop($activityStack); array_pop($activityStack);
$lastStack = end($activityStack); $lastStack = end($activityStack);
if ($activity->level > $lastStack->level) if ($lastStack) {
if ($activity->level > $lastStack->level)
$lastStackIsNotRight = false;
} else {
$lastStackIsNotRight = false; $lastStackIsNotRight = false;
}
} while ($lastStackIsNotRight); } while ($lastStackIsNotRight);
} }

6
app/Http/Controllers/ShowHideColumnController.php

@ -45,12 +45,12 @@ class ShowHideColumnController extends Controller
$success = 0; $success = 0;
foreach ($columns as $column) { foreach ($columns as $key => $column) {
$dataAdd = array( $dataAdd = array(
'version_gantt_id'=>$request->version_gantt_id, 'version_gantt_id'=>$request->version_gantt_id,
'user_id'=>$this->currentId, 'user_id'=>$this->currentId,
'column_name'=>$column, 'column_name'=>$key,
'show'=>true, 'show'=>$column,
'created_by'=>$this->currentName 'created_by'=>$this->currentName
); );

Loading…
Cancel
Save