Add the ability to select a template when adding an incident.
This commit is contained in:
Data-Kiss
@@ -17,6 +17,7 @@ use CachetHQ\Cachet\Bus\Commands\IncidentUpdate\UpdateIncidentUpdateCommand;
|
||||
use CachetHQ\Cachet\Integrations\Contracts\System;
|
||||
use CachetHQ\Cachet\Models\Incident;
|
||||
use CachetHQ\Cachet\Models\IncidentUpdate;
|
||||
use CachetHQ\Cachet\Models\IncidentTemplate;
|
||||
use GrahamCampbell\Binput\Facades\Binput;
|
||||
use Illuminate\Contracts\Auth\Guard;
|
||||
use Illuminate\Routing\Controller;
|
||||
@@ -88,6 +89,7 @@ class IncidentUpdateController extends Controller
|
||||
{
|
||||
return View::make('dashboard.incidents.updates.add')
|
||||
->withIncident($incident)
|
||||
->withIncidentTemplates(IncidentTemplate::all())
|
||||
->withNotificationsEnabled($this->system->canNotifySubscribers());
|
||||
}
|
||||
|
||||
|
||||
@@ -44,4 +44,4 @@
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/Cachet"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
2
public/dist/css/app.css
vendored
2
public/dist/css/app.css
vendored
File diff suppressed because one or more lines are too long
2
public/dist/css/dashboard/dashboard.css
vendored
2
public/dist/css/dashboard/dashboard.css
vendored
File diff suppressed because one or more lines are too long
56
public/dist/js/all.js
vendored
56
public/dist/js/all.js
vendored
File diff suppressed because one or more lines are too long
2
public/dist/js/app.js
vendored
2
public/dist/js/app.js
vendored
File diff suppressed because one or more lines are too long
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"/dist/js/vendor.js": "/dist/js/vendor.js?id=313e4cd2cf600307cb5c",
|
||||
"/dist/js/app.js": "/dist/js/app.js?id=be35dd18d92eef9dee9f",
|
||||
"/dist/css/dashboard/dashboard.css": "/dist/css/dashboard/dashboard.css?id=654823be1de9b1245f17",
|
||||
"/dist/css/app.css": "/dist/css/app.css?id=1b9032e972af93e2c869",
|
||||
"/dist/js/app.js": "/dist/js/app.js?id=04c40dcd7fc0f91a2cc1",
|
||||
"/dist/css/dashboard/dashboard.css": "/dist/css/dashboard/dashboard.css?id=2e8a315f9f8f01a60080",
|
||||
"/dist/css/app.css": "/dist/css/app.css?id=bb04d4c61e5b5d02a938",
|
||||
"/dist/js/manifest.js": "/dist/js/manifest.js?id=40dcfff9d09d402daf38",
|
||||
"/dist/js/all.js": "/dist/js/all.js?id=c77bbe3fb26a84b5347d"
|
||||
"/dist/js/all.js": "/dist/js/all.js?id=eb6400680943aee8df85"
|
||||
}
|
||||
|
||||
@@ -186,7 +186,7 @@ $(function () {
|
||||
});
|
||||
|
||||
// Incident management
|
||||
/*$('select[name=template]').on('change', function () {
|
||||
$('select[name=template]').on('change', function () {
|
||||
var $this = $(this).find('option:selected'),
|
||||
slug = $this.val();
|
||||
|
||||
@@ -208,7 +208,7 @@ $(function () {
|
||||
}
|
||||
});
|
||||
}
|
||||
});*/
|
||||
});
|
||||
|
||||
// Banner removal JS
|
||||
$('#remove-banner').on('click', function (){
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
const Vue = require('vue');
|
||||
|
||||
Vue.component('report-incident', require('./ReportIncident'));
|
||||
Vue.component('update-incident', require('./UpdateIncident'));
|
||||
Vue.component('report-schedule', require('./ReportSchedule'));
|
||||
Vue.component('invite-team', require('./InviteTeam'));
|
||||
|
||||
|
||||
30
resources/assets/js/components/dashboard/UpdateIncident.vue
Normal file
30
resources/assets/js/components/dashboard/UpdateIncident.vue
Normal file
@@ -0,0 +1,30 @@
|
||||
<script>
|
||||
module.exports = {
|
||||
data () {
|
||||
return {
|
||||
template: null,
|
||||
status: null,
|
||||
message: '',
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
getTemplate (template) {
|
||||
axios.get('/dashboard/api/incidents/templates', {
|
||||
params: {
|
||||
slug: template
|
||||
}
|
||||
}).then(response => {
|
||||
this.name = response.data.name
|
||||
this.message = response.data.template
|
||||
}).catch(response => {
|
||||
(new Cachet.Notifier()).notify('There was an error finding that template.');
|
||||
})
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
'template' (template) {
|
||||
this.getTemplate(template)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -19,87 +19,100 @@
|
||||
</div>
|
||||
@endif
|
||||
@include('partials.errors')
|
||||
<form class="form-vertical" name="IncidentUpdateForm" role="form" method="POST" autocomplete="off">
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}">
|
||||
<fieldset>
|
||||
<div class="form-group">
|
||||
<label for="incident-name">{{ trans('forms.incidents.status') }}</label><br>
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="status" value="1" required {{ (int) Binput::old('status') === 1 ? 'checked' : null }}>
|
||||
<i class="icon ion-flag"></i>
|
||||
{{ trans('cachet.incidents.status')[1] }}
|
||||
</label>
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="status" value="2" required {{ (int) Binput::old('status') === 2 ? 'checked' : null }}>
|
||||
<i class="icon ion-alert-circled"></i>
|
||||
{{ trans('cachet.incidents.status')[2] }}
|
||||
</label>
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="status" value="3" required {{ (int) Binput::old('status') === 3 ? 'checked' : null }}>
|
||||
<i class="icon ion-eye"></i>
|
||||
{{ trans('cachet.incidents.status')[3] }}
|
||||
</label>
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="status" value="4" required {{ (int) Binput::old('status') === 4 ? 'checked' : null }}>
|
||||
<i class="icon ion-checkmark"></i>
|
||||
{{ trans('cachet.incidents.status')[4] }}
|
||||
</label>
|
||||
</div>
|
||||
@if($incident->component)
|
||||
<div class="form-group hidden" id="component-status">
|
||||
<input type="hidden" name="component_id" value="{{ $incident->component->id }}">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-body">
|
||||
<div class="radio-items">
|
||||
@foreach(trans('cachet.components.status') as $statusID => $status)
|
||||
<div class="radio-inline">
|
||||
<label>
|
||||
<input type="radio" name="component_status" value="{{ $statusID }}">
|
||||
{{ $status }}
|
||||
</label>
|
||||
</div>
|
||||
<update-incident inline-template>
|
||||
<form class="form-vertical" name="IncidentUpdateForm" role="form" method="POST" autocomplete="off">
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}">
|
||||
<fieldset>
|
||||
@if($incidentTemplates->count() > 0)
|
||||
<div class="form-group">
|
||||
<label for="incident-template">{{ trans('forms.incidents.templates.template') }}</label>
|
||||
<select class="form-control" name="template" v-model="template">
|
||||
<option selected></option>
|
||||
@foreach($incidentTemplates as $tpl)
|
||||
<option value="{{ $tpl->slug }}">{{ $tpl->name }}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
@endif
|
||||
<div class="form-group">
|
||||
<label for="incident-name">{{ trans('forms.incidents.status') }}</label><br>
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="status" value="1" required {{ (int) Binput::old('status') === 1 ? 'checked' : null }}>
|
||||
<i class="icon ion-flag"></i>
|
||||
{{ trans('cachet.incidents.status')[1] }}
|
||||
</label>
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="status" value="2" required {{ (int) Binput::old('status') === 2 ? 'checked' : null }}>
|
||||
<i class="icon ion-alert-circled"></i>
|
||||
{{ trans('cachet.incidents.status')[2] }}
|
||||
</label>
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="status" value="3" required {{ (int) Binput::old('status') === 3 ? 'checked' : null }}>
|
||||
<i class="icon ion-eye"></i>
|
||||
{{ trans('cachet.incidents.status')[3] }}
|
||||
</label>
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="status" value="4" required {{ (int) Binput::old('status') === 4 ? 'checked' : null }}>
|
||||
<i class="icon ion-checkmark"></i>
|
||||
{{ trans('cachet.incidents.status')[4] }}
|
||||
</label>
|
||||
</div>
|
||||
@if($incident->component)
|
||||
<div class="form-group hidden" id="component-status">
|
||||
<input type="hidden" name="component_id" value="{{ $incident->component->id }}">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-body">
|
||||
<div class="radio-items">
|
||||
@foreach(trans('cachet.components.status') as $statusID => $status)
|
||||
<div class="radio-inline">
|
||||
<label>
|
||||
<input type="radio" name="component_status" value="{{ $statusID }}">
|
||||
{{ $status }}
|
||||
</label>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@if($incident->component)
|
||||
<div class="form-group" id="component-status">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading"><strong>{{ $incident->component->name }}</strong></div>
|
||||
<div class="panel-body">
|
||||
<div class="radio-items">
|
||||
@foreach(trans('cachet.components.status') as $statusID => $status)
|
||||
<div class="radio-inline">
|
||||
<label>
|
||||
<input type="radio" name="component_status" value="{{ $statusID }}" {{ $incident->component->status == $statusID ? "checked='checked'" : "" }}>
|
||||
{{ $status }}
|
||||
</label>
|
||||
@endif
|
||||
@if($incident->component)
|
||||
<div class="form-group" id="component-status">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading"><strong>{{ $incident->component->name }}</strong></div>
|
||||
<div class="panel-body">
|
||||
<div class="radio-items">
|
||||
@foreach(trans('cachet.components.status') as $statusID => $status)
|
||||
<div class="radio-inline">
|
||||
<label>
|
||||
<input type="radio" name="component_status" value="{{ $statusID }}" {{ $incident->component->status == $statusID ? "checked='checked'" : "" }}>
|
||||
{{ $status }}
|
||||
</label>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@endif
|
||||
<div class="form-group">
|
||||
<label>{{ trans('forms.incidents.message') }}</label>
|
||||
<div class="markdown-control">
|
||||
<textarea name="message" class="form-control autosize" rows="5" required>{{ Binput::old('message') }}</textarea>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
<input type="hidden" name="incident_id" value="{{ $incident->id }}">
|
||||
|
||||
<div class="form-group">
|
||||
<label>{{ trans('forms.incidents.message') }}</label>
|
||||
<div class="markdown-control">
|
||||
<textarea name="message" class="form-control autosize" rows="5" required>{{ Binput::old('message') }}</textarea>
|
||||
<div class="btn-group">
|
||||
<button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
|
||||
<a class="btn btn-default" href="{{ cachet_route('dashboard.incidents') }}">{{ trans('forms.cancel') }}</a>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
<input type="hidden" name="incident_id" value="{{ $incident->id }}">
|
||||
|
||||
<div class="form-group">
|
||||
<div class="btn-group">
|
||||
<button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
|
||||
<a class="btn btn-default" href="{{ cachet_route('dashboard.incidents') }}">{{ trans('forms.cancel') }}</a>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</form>
|
||||
</update-incident>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user