From 02a034d4bd03cc75c6eb3557b173d9d68b44dc43 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Fri, 16 Jun 2017 08:32:17 +0000
Subject: - Produktgruppenfilter im Backend optimiert

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6334 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/admin/form/input_submit.phtml |  2 +-
 views/produkt/index.phtml           | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/views/admin/form/input_submit.phtml b/views/admin/form/input_submit.phtml
index 4252f0d..e12cbdc 100644
--- a/views/admin/form/input_submit.phtml
+++ b/views/admin/form/input_submit.phtml
@@ -3,7 +3,7 @@
 	<label class="col-sm-6 control-label" >&nbsp;</label>
 	
 	<div class="col-sm-6">
-		<input type="submit" value="<?php echo $this->view['field_label']; ?>" class="button button-primary" />		
+		<input name="submit-button" type="submit" value="<?php echo $this->view['field_label']; ?>" class="button button-primary" />		
 	</div>
 	
 </div>
\ No newline at end of file
diff --git a/views/produkt/index.phtml b/views/produkt/index.phtml
index 0d10c4c..eb07cd8 100644
--- a/views/produkt/index.phtml
+++ b/views/produkt/index.phtml
@@ -16,7 +16,7 @@
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav">
 					<li role="presentation" class="<?php echo ((!isset($_REQUEST['action']))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt"><?php echo wpsg_translate(__("Produktübersicht (#1# Produkte)", "wpsg"), $this->view['countAll']); ?></a></li>
-					<li role="presentation" class="wpsg_showhide_filter <?php echo (($this->view['hasFilter'] === true)?'active':''); ?>"><a href="#" onclick="return false;"><span class="glyphicon glyphicon-search"></span><?php echo __("Suche", "wpsg"); ?></a></li>
+					<li role="presentation" class="wpsg_showhide_filter <?php echo (($this->view['submit'] === true)?'active':''); ?>"><a href="#" onclick="return false;"><span class="glyphicon glyphicon-search"></span><?php echo __("Suche", "wpsg"); ?></a></li>
 			 		<li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'add'))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=add"><span class="glyphicon glyphicon-plus"></span><?php echo __("Hinzufügen", "wpsg"); ?></a></li>
 				</ul>
 				<ul class="nav navbar-nav navbar-right">
@@ -30,7 +30,7 @@
 			 	</ul>			 	
 			</div>
 		</div>
-		<div class="wpsg-filter container-fluid form-horizontal" style="display:<?php echo (($this->view['hasFilter'] === true)?'block':'none'); ?>;">
+		<div class="wpsg-filter container-fluid form-horizontal" style="display:<?php echo (($this->view['submit'] === true)?'block':'none'); ?>;">
 			<div class="row">
 				<div class="col-lg-4">
 					<form method="post" id="filter_form">
@@ -41,10 +41,16 @@
 										
 						<?php echo wpsg_drawForm_Input('filter[s]', __('Suchfeld', 'wpsg'), wpsg_getStr($this->view['arFilter']['s'])); ?>
                         
+                        <?php $filterAll = $this->view['arFilter']; unset($filterAll['productgroup_ids']); ?>
+                        
                         <?php if ($this->hasMod('wpsg_mod_productgroups')) { ?>
-                        <?php echo wpsg_drawForm_Select('filter[productgroup_ids]', __('Produktgruppe', 'wpsg'), wpsg_array_merge(array('-1' => wpsg_translate(__('Alle Produktgruppen (#1#)', 'wpsg'), wpsg_product::count())), wpsg_productgroup::getProductgroupSelect()), @$this->view['arFilter']['productgroup_ids']); ?>
+                        <?php echo wpsg_drawForm_Select('filter[productgroup_ids]', __('Produktgruppe', 'wpsg'), wpsg_array_merge(array('-1' => wpsg_translate(__('Alle Produktgruppen (#1#)', 'wpsg'), wpsg_product::count($filterAll))), wpsg_productgroup::getProductgroupSelect($this->view['arFilter'])), @$this->view['arFilter']['productgroup_ids']); ?>
                         <?php } ?>
 						
+                        <?php if (wpsg_istrue($this->view['submit'])) { ?>
+                        <input type="hidden" name="submit-button" value="1" />
+                        <?php } ?>
+                        
 						<?php echo wpsg_drawForm_SubmitButton(__('Produkte suchen')); ?><br />
 						
 					</form>				
@@ -53,12 +59,14 @@
 		</div>
 	</nav>
 
-    <?php if ($this->hasMod('wpsg_mod_productgroups')) { $arProductgroupSelect = wpsg_productgroup::getProductgroupSelect(); ?>
+    <?php if ($this->hasMod('wpsg_mod_productgroups')) { $arProductgroupSelect = wpsg_productgroup::getProductgroupSelect($this->view['arFilter']); ?>
         <?php if (wpsg_isSizedArray($arProductgroupSelect)) { ?>
             <div class="pagination_wrap wpsg_productgroup_link_wrap">
-
+                
+                <?php $filterAll = $this->view['arFilter']; unset($filterAll['productgroup_ids']); ?>
+                
                 <ul class="pagination">
-                    <li class="<?php echo ((wpsg_getStr($this->view['arFilter']['productgroup_ids']) == '-1' || !isset($this->view['arFilter']['productgroup_ids']))?'active':''); ?>"><a href="#" onclick="jQuery('#filterproductgroup_ids').val('-1'); jQuery('#filter_form').submit(); return false;"><?php echo wpsg_translate(__('Alle (#1#)', 'wpsg'), wpsg_product::count()); ?></a></li>
+                    <li class="<?php echo ((wpsg_getStr($this->view['arFilter']['productgroup_ids']) == '-1' || !isset($this->view['arFilter']['productgroup_ids']))?'active':''); ?>"><a href="#" onclick="jQuery('#filterproductgroup_ids').val('-1'); jQuery('#filter_form').submit(); return false;"><?php echo wpsg_translate(__('Alle (#1#)', 'wpsg'), wpsg_product::count($filterAll)); ?></a></li>
                     <?php foreach ($arProductgroupSelect as $pg_id => $pg_name) { ?>
                     <li class="<?php echo ((wpsg_getStr($this->view['arFilter']['productgroup_ids']) == $pg_id)?'active':''); ?>"><a href="#" onclick="jQuery('#filterproductgroup_ids').val('<?php echo $pg_id; ?>'); jQuery('#wpsg_seite').val('1'); jQuery('#filter_form').submit(); return false;"><?php echo $pg_name; ?></a></li>
                     <?php } ?>
-- 
cgit v1.2.3