mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-01-17 13:38:20 +01:00
Code Issues Projects Releases Wiki Activity

Move HumanStatus to Presenter

Browse Source
This commit is contained in:
phecho 2015-12-23 19:44:06 +08:00
parent d5a71976d2
commit 8a47dd873f
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Models/Component.php
View File

@ -157,16 +157,6 @@ class Component extends Model implements HasPresenter
return $query->where('enabled', false);
}
/**
* Looks up the human readable version of the status.
*
* @return string
*/
public function getHumanStatusAttribute()
{
return trans('cachet.components.status.'.$this->status);
}
/**
* Returns all of the tags on this component.
*

12
app/Presenters/ComponentPresenter.php
View File

@ -32,6 +32,16 @@ class ComponentPresenter extends AbstractPresenter
}
}
/**
* Looks up the human readable version of the status.
*
* @return string
*/
public function human_status()
{
return trans('cachet.components.status.'.$this->wrappedObject->status);
}
/**
* Convert the presenter instance to an array.
*
@ -42,7 +52,7 @@ class ComponentPresenter extends AbstractPresenter
return array_merge($this->wrappedObject->toArray(), [
'created_at' => $this->created_at(),
'updated_at' => $this->updated_at(),
'status_name' => $this->wrappedObject->humanStatus,
'status_name' => $this->human_status(),
]);
}
}

2
resources/views/dashboard/components/index.blade.php
View File

@ -25,7 +25,7 @@
@if($components->count() > 1)
<span class="drag-handle"><i class="ion-drag"></i></span>
@endif
{{ $component->name }} <small>{{ $component->humanStatus }}</small>
{{ $component->name }} <small>{{ $component->human_status }}</small>
</h4>
@if($component->group)
<p><small>{{ trans('dashboard.components.listed_group', ['name' => $component->group->name]) }}</small></p>

2
resources/views/incident.blade.php
View File

@ -14,7 +14,7 @@
<div class="moment first">
<div class="row event clearfix">
<div class="col-sm-1">
<div class="status-icon status-{{ $incident->status }}" data-toggle="tooltip" title="{{ $incident->humanStatus }}" data-placement="left">
<div class="status-icon status-{{ $incident->status }}" data-toggle="tooltip" title="{{ $incident->human_status }}" data-placement="left">
<i class="{{ $incident->icon }}"></i>
</div>
</div>

2
resources/views/partials/component.blade.php
View File

@ -10,6 +10,6 @@
@endif
<div class="pull-right">
<small class="text-component-{{ $component->status }} {{ $component->status_color }}">{{ $component->humanStatus }}</small>
<small class="text-component-{{ $component->status }} {{ $component->status_color }}">{{ $component->human_status }}</small>
</div>
</li>

2
resources/views/partials/incidents.blade.php
View File

@ -5,7 +5,7 @@
<div class="moment {{ $incidentID === 0 ? 'first' : null }}">
<div class="row event clearfix">
<div class="col-sm-1">
<div class="status-icon status-{{ $incident->status }}" data-toggle="tooltip" title="{{ $incident->humanStatus }}" data-placement="left">
<div class="status-icon status-{{ $incident->status }}" data-toggle="tooltip" title="{{ $incident->human_status }}" data-placement="left">
<i class="{{ $incident->icon }}"></i>
</div>
</div>