Skip to content

Commit

Permalink
some broken links
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcelfolaron
marcelfolaron committed Sep 21, 2024
1 parent bc2b7cb commit 87b5995
Show file tree
Hide file tree
Showing 5 changed files with 237 additions and 222 deletions.
5 changes: 4 additions & 1 deletion app/Domain/Goalcanvas/Controllers/DelCanvasItem.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class DelCanvasItem extends Controller
*/
public function init()
{
$repoName = app()->getNamespace() . "Domain\\goalcanvas\\Repositories\\goalcanvas";
$repoName = app()->getNamespace() . "Domain\\Goalcanvas\\Repositories\\Goalcanvas";
$this->canvasRepo = app()->make($repoName);
}

Expand All @@ -41,6 +41,8 @@ public function run()
{
Auth::authOrRedirect([Roles::$owner, Roles::$admin, Roles::$manager, Roles::$editor]);

$id = (int)($_GET['id']) ?? '';

if (isset($_POST['del']) && isset($_GET['id'])) {
$id = (int)($_GET['id']);
$this->canvasRepo->delCanvasItem($id);
Expand All @@ -49,6 +51,7 @@ public function run()
return Frontcontroller::redirect(BASE_URL . '/' . static::CANVAS_NAME . 'canvas/showCanvas');
}

$this->tpl->assign("id", $id);
return $this->tpl->displayPartial(static::CANVAS_NAME . 'canvas.delCanvasItem');
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/Domain/Goalcanvas/Templates/canvasComment.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
window.onload = function() {
if (!window.jQuery) {
//It's not a modal
location.href = "{{ BASE_URL }} /goalcanvas/showCanvas?showModal={{ $canvasItem['id'] }}";
location.href = "{{ BASE_URL }}/goalcanvas/showCanvas?showModal={{ $canvasItem['id'] }}";
}
}
</script>
Expand Down
18 changes: 9 additions & 9 deletions app/Domain/Goalcanvas/Templates/dashboard.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@

<ul class="dropdown-menu canvasSelector">
@if ($login::userIsAtLeast($roles::$editor))
<li><a href="#/goalcanvas/bigRock">{{ __("links.icon.create_new_board") }}</a></li>
<li><a href="#/goalcanvas/bigRock">{!! __("links.icon.create_new_board") !!}</a></li>
@endif
<li class="border"></li>
@foreach ($allCanvas as $canvasRow)
<li><a href="{{ BASE_URL }}/goalcanvas/showCanvas/{{ $canvasRow['id'] }}">{{ $tpl->escape($canvasRow['title']) }}</a></li>
<li><a href="{{ BASE_URL }}/goalcanvas/showCanvas/{{ $canvasRow['id'] }}">{{ $canvasRow['title'] }}</a></li>
@endforeach
</ul>
</span>
Expand Down Expand Up @@ -108,7 +108,7 @@
<div class="col-md-12">
<a href='#/goalcanvas/editCanvasItem?type=goal&canvasId={{ $canvasRow["id"] }}' class='btn btn-primary pull-right'><i class="fa fa-plus"></i> Create New Goal</a>

<h5 class='subtitle'><a href='{{ BASE_URL }}/goalcanvas/showCanvas/{{ $canvasRow["id"] }}'>{{ $tpl->escape($canvasRow["title"]) }}</a></h5>
<h5 class='subtitle'><a href='{{ BASE_URL }}/goalcanvas/showCanvas/{{ $canvasRow["id"] }}'>{{ $canvasRow["title"] }}</a></h5>
</div>
</div>
<div class="row" style="border-bottom:1px solid var(--main-border-color); margin-bottom:20px">
Expand Down Expand Up @@ -147,20 +147,20 @@
&nbsp;&nbsp;&nbsp;
<ul class="dropdown-menu">
<li class="nav-header">{{ __("subtitles.edit") }}</li>
<li><a href="#/goalcanvas/editCanvasItem/{{ $row["id"] }}" class="goalCanvasModal" data="item_{{ $row["id"] }}">{{ __("links.edit_canvas_item") }}</a></li>
<li><a href="#/goalcanvas/delCanvasItem/{{ $row["id"] }}" class="delete goalCanvasModal" data="item_{{ $row["id"] }}">{{ __("links.delete_canvas_item") }}</a></li>
<li><a href="#/goalcanvas/editCanvasItem/{{ $row["id"] }}" class="goalCanvasModal" data="item_{{ $row["id"] }}">{!! __("links.edit_canvas_item") !!}</a></li>
<li><a href="#/goalcanvas/delCanvasItem/{{ $row["id"] }}" class="delete goalCanvasModal" data="item_{{ $row["id"] }}">{!! __("links.delete_canvas_item") !!}</a></li>
</ul>
@endif
</div>

<h4>
<strong>Goal:</strong>
<a href="#/goalcanvas/editCanvasItem/{{ $row['id'] }}" class="goalCanvasModal" data="item_{{ $row['id'] }}">
{{ $tpl->e($row["title"]) }}
{{ $row["title"] }}
</a>
</h4>
<br />
<strong>Metric:</strong> {{ $tpl->escape($row["description"]) }}
<strong>Metric:</strong> {{$row["description"] }}
<br /><br />

@php
Expand Down Expand Up @@ -210,7 +210,7 @@
@foreach ($statusLabels as $key => $data)
@if ($data['active'] || true)
<li class='dropdown-item'>
<a href="javascript:void(0);" class="label-{{ $data['dropdown'] }}" data-label='{{ $data["title"] }}' data-value="{{ $row['id'] . "/" . $key }}" id="ticketStatusChange{{ $row['id'] . $key }}">{{ $data['title'] }}</a>
<a href="javascript:void(0);" class="label-{{ $data['dropdown'] }}" data-label='{{ $data["title"] }}' data-value="{{ $row['id'] . "/" . $key }}" id="ticketStatusChange{{ $row['id'] . $key }}">{!! $data['title'] !!}</a>
</li>
@endif
@endforeach
Expand All @@ -228,7 +228,7 @@
@foreach ($relatesLabels as $key => $data)
@if ($data['active'] || true)
<li class='dropdown-item'>
<a href="javascript:void(0);" class="label-{{ $data['dropdown'] }}" data-label='{{ $data["title"] }}' data-value="{{ $row['id'] . "/" . $key }}" id="ticketRelatesChange{{ $row['id'] . $key }}">{{ $data['title'] }}</a>
<a href="javascript:void(0);" class="label-{{ $data['dropdown'] }}" data-label='{{ $data["title"] }}' data-value="{{ $row['id'] . "/" . $key }}" id="ticketRelatesChange{{ $row['id'] . $key }}">{!! $data['title'] !!}</a>
</li>
@endif
@endforeach
Expand Down
Loading

0 comments on commit 87b5995

Please sign in to comment.