diff --git a/app/Http/Controllers/OrganiserCustomizeController.php b/app/Http/Controllers/OrganiserCustomizeController.php index 8fdc5e03..d38b1e27 100644 --- a/app/Http/Controllers/OrganiserCustomizeController.php +++ b/app/Http/Controllers/OrganiserCustomizeController.php @@ -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' => '', ]); } diff --git a/app/Http/Controllers/OrganiserViewController.php b/app/Http/Controllers/OrganiserViewController.php index f73c8fb9..fe745f16 100644 --- a/app/Http/Controllers/OrganiserViewController.php +++ b/app/Http/Controllers/OrganiserViewController.php @@ -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(); diff --git a/database/migrations/2016_03_27_223733_add_organiser_page_toggle.php b/database/migrations/2016_03_27_223733_add_organiser_page_toggle.php new file mode 100644 index 00000000..f3b03046 --- /dev/null +++ b/database/migrations/2016_03_27_223733_add_organiser_page_toggle.php @@ -0,0 +1,31 @@ +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'); + }); + } +} diff --git a/resources/views/ManageOrganiser/Customize.blade.php b/resources/views/ManageOrganiser/Customize.blade.php index c888804b..e36381c8 100644 --- a/resources/views/ManageOrganiser/Customize.blade.php +++ b/resources/views/ManageOrganiser/Customize.blade.php @@ -11,17 +11,7 @@ @stop @section('top_nav') - + @include('ManageOrganiser.Partials.TopNav') @stop @section('head') @@ -61,6 +51,18 @@
{!! Form::model($organiser, array('url' => route('postEditOrganiser', ['organiser_id' => $organiser->id]), 'class' => 'ajax')) !!} +
+ {!! 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' + )) !!} +
+ Organiser pages contain a public list of past and upcoming events. +
+
{!! Form::label('name', 'Organiser Name', array('class'=>'required control-label ')) !!} {!! Form::text('name', Input::old('name'), @@ -140,6 +142,7 @@
{!! Form::model($organiser, array('url' => route('postEditOrganiserPageDesign', ['event_id' => $organiser->id]), 'class' => 'ajax ')) !!}

Organiser Design

+
diff --git a/resources/views/ManageOrganiser/Events.blade.php b/resources/views/ManageOrganiser/Events.blade.php index f66e3d63..bc25ee0d 100644 --- a/resources/views/ManageOrganiser/Events.blade.php +++ b/resources/views/ManageOrganiser/Events.blade.php @@ -11,18 +11,7 @@ @stop @section('top_nav') - + @include('ManageOrganiser.Partials.TopNav') @stop @section('head') diff --git a/resources/views/ManageOrganiser/Partials/TopNav.blade.php b/resources/views/ManageOrganiser/Partials/TopNav.blade.php index 2224812b..343e701e 100644 --- a/resources/views/ManageOrganiser/Partials/TopNav.blade.php +++ b/resources/views/ManageOrganiser/Partials/TopNav.blade.php @@ -8,8 +8,8 @@ -

- {!!HTML::link('/o/'.$event->organiser->id, $event->organiser->name, array('title' => "Organiser Page"))!!} + @if($event->organiser->enable_organiser_page) + + {{$event->organiser->name}} + + @else + {{$event->organiser->name}} + @endif