c-cms/c-cms-legacy
1
0
Fork 0
mirror of https://gitlab.com/TheGamecraft/c-cms.git synced 2026-04-21 02:39:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'master'

Browse Source 
Dev

See merge request TheGamecraft/c-cms!79
This commit is contained in:
Mathieu Lagace
2019-10-19 20:38:52 +00:00
parent 44a4035f42 13af227a7d
commit 21111ae622
3 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/Http/Controllers/EventController.php
View File

@@ -58,7 +58,14 @@ class EventController extends Controller
{
$event->msg = "";
}
$event->date_msg = request('date_msg');
if(\request('date_msg'))
{
$event->date_msg = request('date_msg');
}
else
{
$event->date_msg = "";
}
$event->save();
if ($event->type == 1) {
@@ -138,8 +145,22 @@ class EventController extends Controller
$event->is_mandatory = 0;
}
$event->desc = request('desc');
$event->msg = \request('msg');
if(\request('msg'))
{
$event->msg = request('msg');
}
else
{
$event->msg = "";
}
if(\request('date_msg'))
{
$event->date_msg = request('date_msg');
}
else
{
$event->date_msg = "";
}
$event->save();
if ($event->type == 1) {

4
resources/views/admin/schedule/event/edit.blade.php
View File

@@ -91,12 +91,12 @@
<div class="col-md-6">
<div class="form-group">
<label class="label-control">Date et heure de publication des messages de la semaine</label>
<input name="date_msg" type="text" id="datetimepickermsg" class="form-control datetimepicker" required/>
<input name="date_msg" type="text" id="datetimepickermsg" class="form-control datetimepicker"/>
</div>
</div>
<div class="col-md-12">
<div class="form-group">
<textarea class="form-control richeditor" name="msg" id="msg" rows="6" required>{{$activity->msg}}</textarea>
<textarea class="form-control richeditor" name="msg" id="msg" rows="6">{{$activity->msg}}</textarea>
</div>
</div>
</div>

4
resources/views/admin/schedule/modal/add.blade.php
View File

@@ -67,13 +67,13 @@
<div class="col-md-6">
<div class="form-group">
<label class="label-control">Date et heure de publication des messages de la semaine</label>
<input name="date_msg" type="text" id="datetimepickermsg" class="form-control datetimepicker" required/>
<input name="date_msg" type="text" id="datetimepickermsg" class="form-control datetimepicker"/>
</div>
</div>
<div class="col-md-12">
<div class="form-group">
<label for="desc">Message de le semaine</label>
<textarea class="form-control richeditor" name="msg" id="msg" rows="6" required>{{\App\Config::getData('default_weekly_msg')}}</textarea>
<textarea class="form-control richeditor" name="msg" id="msg" rows="6">{{\App\Config::getData('default_weekly_msg')}}</textarea>
</div>
</div>
</div>