group components on manage subscriptions page #1983
Conversation
| @@ -0,0 +1,18 @@ | |||
| <li class="list-group-item {{ $component->group_id ? "sub-component" : "component" }}"> | |||
| <div class="checkbox"> | |||
There was a problem hiding this comment.
Please correct this indentation.
| */ | ||
| public function has_subscriber($subscriptions) | ||
| { | ||
| $enabled_components = $this->wrappedObject->enabled_components()->orderBy('order')->pluck('id')->toArray(); |
There was a problem hiding this comment.
Please correct the indentation here too.
|
I'm going through the entire thing now; it was done on-server using Nano, so the indentation is all whacked up. Going through with TextMate now and cleaning those files up. |
| @endforeach | ||
| <div class="panel-body"> | ||
| @if(!$component_groups->isEmpty() || !$ungrouped_components->isEmpty()) | ||
| @include('partials.components_form') |
There was a problem hiding this comment.
Please don't indent the Blade syntax 😄
There was a problem hiding this comment.
can you clarify here? What's broken with the indentation?
There was a problem hiding this comment.
Are you saying to left-align the @includes?
|
Awesome, thanks! |
|
open to any other feedback gents; happy to tweak before any merges happen. |
| @@ -147,15 +148,19 @@ public function showManage($code = null) | |||
| } | |||
|
|
|||
| $subscriber = Subscriber::where('verify_code', '=', $code)->first(); | |||
| $usedComponentGroups = Component::enabled()->where('group_id', '>', 0)->groupBy('group_id')->pluck('group_id'); | |||
There was a problem hiding this comment.
@CachetHQ/owners I feel like we need a better way to handle this and the next 2 lines too.
There was a problem hiding this comment.
I have only dealt with laravel briefly in the past; so I apologize in advance for anything that is overly hack-ish :)
There was a problem hiding this comment.
Not at all, this is something for us to deal with, you've done the right thing.
| @@ -13,7 +13,7 @@ | |||
| </li> | |||
| <div class="form-group group-items {{ $componentGroup->has_subscriber($subscriptions) ? null : "hide" }}"> | |||
| @foreach($componentGroup->enabled_components()->orderBy('order')->get() as $component) | |||
| @include('partials.component_input', compact($component)) | |||
| @include('partials.component_input', compact($component)) | |||
There was a problem hiding this comment.
Not that far left, sorry. Just so that it's directly underneath the @foreach or @if etc.
|
👍 |
A possible solution to #1909