Version 5.0.0 beta 10
This commit is contained in:
1 parent
56979f8ee8
commit
264eeb97e0
325 files changed
+6442
-1849
No files matched your search
@@ -4280,14 +4280,11 @@ class members extends Controller
|
||||
/* Run callbacks */
|
||||
foreach ( Application::allExtensions( 'core', 'MemberFilter', TRUE, 'core' ) as $key => $extension )
|
||||
{
|
||||
if( method_exists( $extension, 'queryCallback' ) )
|
||||
/* Grab our fields and add to the form */
|
||||
if( !empty( $wizardData['filters'][ $key ] ) )
|
||||
{
|
||||
/* Grab our fields and add to the form */
|
||||
if( !empty( $wizardData['filters'][ $key ] ) )
|
||||
{
|
||||
$data = $wizardData['filters'][ $key ];
|
||||
$extension->queryCallback( $data, $query );
|
||||
}
|
||||
$data = $wizardData['filters'][ $key ];
|
||||
$extension->queryCallback( $data, $query );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4488,19 +4485,16 @@ class members extends Controller
|
||||
$lastApp = 'core';
|
||||
foreach ( Application::allExtensions( 'core', 'MemberFilter', FALSE, 'core' ) as $key => $extension )
|
||||
{
|
||||
if( method_exists( $extension, 'getSettingField' ) )
|
||||
$_key = explode( '_', $key );
|
||||
if( $_key[0] != $lastApp )
|
||||
{
|
||||
$_key = explode( '_', $key );
|
||||
if( $_key[0] != $lastApp )
|
||||
{
|
||||
$lastApp = $_key[0];
|
||||
$form->addHeader( $lastApp . '_bm_filters' );
|
||||
}
|
||||
|
||||
foreach ( $extension->getSettingField( $wizardData['filters'][$key] ?? array() ) as $field )
|
||||
{
|
||||
$form->add( $field );
|
||||
}
|
||||
$lastApp = $_key[0];
|
||||
$form->addHeader( $lastApp . '_bm_filters' );
|
||||
}
|
||||
|
||||
foreach ( $extension->getSettingField( $wizardData['filters'][$key] ?? array() ) as $field )
|
||||
{
|
||||
$form->add( $field );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4510,13 +4504,10 @@ class members extends Controller
|
||||
|
||||
foreach ( Application::allExtensions( 'core', 'MemberFilter', TRUE, 'core' ) as $key => $extension )
|
||||
{
|
||||
if( method_exists( $extension, 'save' ) )
|
||||
$_value = $extension->save( $values );
|
||||
if( $_value )
|
||||
{
|
||||
$_value = $extension->save( $values );
|
||||
if( $_value )
|
||||
{
|
||||
$wizardData['filters'][ $key ] = $_value;
|
||||
}
|
||||
$wizardData['filters'][ $key ] = $_value;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user