added ability to exclude elements

lukesnowden · Jan 24, 2019 · 3539ee6 · 3539ee6
1 parent 41ec405
commit 3539ee6
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/app/Libs/BaseRegion.php b/app/Libs/BaseRegion.php
@@ -52,6 +52,11 @@ public function render()
     {
         $html = '';
         foreach( $this->elements as $element ) {
+            if( method_exists( $element, 'active' ) ) {
+                if( ! $element->active() ) {
+                    continue;
+                }
+            }
             $html .= $element->render() . "\n";
         }
         return $html;

diff --git a/app/Libs/Elements/Traits/Formats/SelectBootstrap.php b/app/Libs/Elements/Traits/Formats/SelectBootstrap.php
@@ -24,7 +24,7 @@ protected function options()
     {
         $html = '';
         foreach( $this->options as $value => $text ) {
-            $selected = "{{ \${$this->valueKeyName()} === '{$value}' ? 'selected' : '' }}";
+            $selected = "{{ \${$this->valueKeyName()} === '" . addslashes($value) . "' ? 'selected' : '' }}";
             $html .= sprintf( '<option %s value="%s">%s</option>', $selected, $value, $text ) . "\n";
         }
         return $html;

diff --git a/app/Libs/Register.php b/app/Libs/Register.php
@@ -333,6 +333,11 @@ public function viewComposer()
                 $viewObject->setViewData( $view->getData() );
                 $data = [];
                 foreach( $viewObject->elements() as $element ) {
+                    if( method_exists( $element, 'active' ) ) {
+                        if( ! $element->active() ) {
+                            continue;
+                        }
+                    }
                     $element->displaying();
                     $data[ $element->valueKeyName() ] = old( $element->name() ) ? old( $element->name() ) : $element->value();
                     if( method_exists( $element, 'statusKeyName' ) ) {
@@ -367,6 +372,11 @@ public function dispatchPayload( $viewClass, $model, $request )
     {
         $view = new $viewClass;
         foreach( $view->elements() as $element ) {
+            if( method_exists( $element, 'active' ) ) {
+                if( ! $element->active() ) {
+                    continue;
+                }
+            }
             $element->receivePayload( $model, $request );
         }
     }
@@ -382,6 +392,11 @@ public function getValidation( $viewClass, $request )
         $rules = [];
         $messages = [];
         foreach( $view->elements() as $element ) {
+            if( method_exists( $element, 'active' ) ) {
+                if( ! $element->active() ) {
+                    continue;
+                }
+            }
             $element->beforeValidation( $request );
             $data = $element->getValidationData();
             $rules[ $data[ 'name' ] ] = $data[ 'rules' ];