Added option to hide organiser page from public view
This commit is contained in:
Dave
parent
2cc3bbd6ae
commit
61e18f01de
|
|
@ -46,16 +46,10 @@ class OrganiserCustomizeController extends MyBaseController
|
|||
$organiser->name = $request->get('name');
|
||||
$organiser->about = $request->get('about');
|
||||
$organiser->email = $request->get('email');
|
||||
$organiser->enable_organiser_page = $request->get('enable_organiser_page');
|
||||
$organiser->facebook = $request->get('facebook');
|
||||
$organiser->twitter = $request->get('twitter');
|
||||
|
||||
/*
|
||||
* If the email has been changed the user must confirm the email.
|
||||
*/
|
||||
if ($organiser->email !== $request->get('email')) {
|
||||
$organiser->is_email_confirmed = 0;
|
||||
}
|
||||
|
||||
if ($request->get('remove_current_image') == '1') {
|
||||
$organiser->logo_path = '';
|
||||
}
|
||||
|
|
@ -87,9 +81,7 @@ class OrganiserCustomizeController extends MyBaseController
|
|||
|
||||
return response()->json([
|
||||
'status' => 'success',
|
||||
'redirectUrl' => route('showOrganiserCustomize', [
|
||||
'organiser_id' => $organiser->id,
|
||||
]),
|
||||
'redirectUrl' => '',
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ namespace App\Http\Controllers;
|
|||
use App\Models\Organiser;
|
||||
use View;
|
||||
use Carbon\Carbon;
|
||||
use Auth;
|
||||
|
||||
class OrganiserViewController extends Controller
|
||||
{
|
||||
|
|
@ -12,6 +13,10 @@ class OrganiserViewController extends Controller
|
|||
{
|
||||
$organiser = Organiser::findOrFail($organiser_id);
|
||||
|
||||
if(!$organiser->enable_organiser_page && !Auth::check()) {
|
||||
abort(404);
|
||||
}
|
||||
|
||||
$upcoming_events = $organiser->events()->where('end_date', '>=', Carbon::now())->get();
|
||||
$past_events = $organiser->events()->where('end_date', '<', Carbon::now())->get();
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
|
||||
class AddOrganiserPageToggle extends Migration
|
||||
{
|
||||
/**
|
||||
* Run the migrations.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function up()
|
||||
{
|
||||
Schema::table('organisers', function (Blueprint $table) {
|
||||
$table->boolean('enable_organiser_page')->default(1);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverse the migrations.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function down()
|
||||
{
|
||||
Schema::table('organisers', function (Blueprint $table) {
|
||||
$table->dropColumn('enable_organiser_page');
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -11,17 +11,7 @@
|
|||
@stop
|
||||
|
||||
@section('top_nav')
|
||||
<ul class="nav navbar-nav navbar-left">
|
||||
<li class="navbar-main">
|
||||
<a href="javascript:void(0);" class='toggleSidebar' title="Organisers">
|
||||
<span class="toggleSidebarIcon">
|
||||
<span class="icon">
|
||||
<i class="ico-menu"></i>
|
||||
</span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
@include('ManageOrganiser.Partials.TopNav')
|
||||
@stop
|
||||
|
||||
@section('head')
|
||||
|
|
@ -61,6 +51,18 @@
|
|||
<div class="tab-pane active" id="organiserSettings">
|
||||
{!! Form::model($organiser, array('url' => route('postEditOrganiser', ['organiser_id' => $organiser->id]), 'class' => 'ajax')) !!}
|
||||
|
||||
<div class="form-group">
|
||||
{!! Form::label('enable_organiser_page', 'Enable Public Organiser Page', array('class'=>'control-label required')) !!}
|
||||
{!! Form::select('enable_organiser_page', [
|
||||
'1' => 'Make organiser page visible to the public.',
|
||||
'0' => 'Hide organiser page from the public.'],Input::old('enable_organiser_page'),
|
||||
array(
|
||||
'class'=>'form-control'
|
||||
)) !!}
|
||||
<div class="help-block">
|
||||
Organiser pages contain a public list of past and upcoming events.
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
{!! Form::label('name', 'Organiser Name', array('class'=>'required control-label ')) !!}
|
||||
{!! Form::text('name', Input::old('name'),
|
||||
|
|
@ -140,6 +142,7 @@
|
|||
<div class="tab-pane" id="OrganiserPageDesign">
|
||||
{!! Form::model($organiser, array('url' => route('postEditOrganiserPageDesign', ['event_id' => $organiser->id]), 'class' => 'ajax ')) !!}
|
||||
<h4>Organiser Design</h4>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
|
|
|
|||
|
|
@ -11,18 +11,7 @@
|
|||
@stop
|
||||
|
||||
@section('top_nav')
|
||||
<ul class="nav navbar-nav navbar-left">
|
||||
<li class="navbar-main">
|
||||
<a href="javascript:void(0);" class="toggleSidebar" title="Organisers">
|
||||
<span class="toggleSidebarIcon">
|
||||
<span class="icon">
|
||||
<i class="ico-menu"></i>
|
||||
</span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
@include('ManageOrganiser.Partials.TopNav')
|
||||
@stop
|
||||
|
||||
@section('head')
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
</a>
|
||||
</li>
|
||||
<!--/ Show Side Menu -->
|
||||
<li class="nav-button hide">
|
||||
<a target="_blank" href="{{ $organiser->event_url }}">
|
||||
<li class="nav-button ">
|
||||
<a target="_blank" href="{{ route('showOrganiserHome',[$organiser->id]) }}">
|
||||
<span>
|
||||
<i class="ico-eye2"></i> Organiser Page
|
||||
</span>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,13 @@
|
|||
<img alt="{{$event->organiser->name}}" src="{{asset($event->organiser->full_logo_path)}}" property="logo">
|
||||
</div>
|
||||
<h3 property="name">
|
||||
{!!HTML::link('/o/'.$event->organiser->id, $event->organiser->name, array('title' => "Organiser Page"))!!}
|
||||
@if($event->organiser->enable_organiser_page)
|
||||
<a href="{{route('showOrganiserHome', [$event->organiser->id, Str::slug($event->organiser->name)])}}" title="Organiser Page">
|
||||
{{$event->organiser->name}}
|
||||
</a>
|
||||
@else
|
||||
{{$event->organiser->name}}
|
||||
@endif
|
||||
</h3>
|
||||
|
||||
<p property="description">
|
||||
|
|
|
|||
Loading…
Reference in New Issue