From 419d6678e11d2b911e7f09b4a11853e60accd392 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Sun, 6 Mar 2016 10:08:07 +0000
Subject: - Dummy Bild in Produktverwaltung - MakeTN kommt jetzt auch mit
 Bildern klar, die keinem Produkt zugeordnet sind

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5386 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/js/admin.js                                      |  2 +-
 .../mods/mod_productgroups/produkt_index_filter.phtml  |  2 +-
 views/produkt/index.phtml                              | 18 +++++++-----------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/views/js/admin.js b/views/js/admin.js
index d86bccf..7c3d016 100644
--- a/views/js/admin.js
+++ b/views/js/admin.js
@@ -206,7 +206,7 @@ function wpsg_in_array(needle, haystack)
 			else
 			{
 			
-				jQuery('.wpsg-filter').slideDown(150, function() { jQuery('.wpsg-filter input').first().focus(); } );
+				jQuery('.wpsg-filter').slideDown(150, function() { jQuery('.wpsg-filter input[type="text"]').first().focus(); } );
 				jQuery(this).addClass('active');
 				
 			}
diff --git a/views/mods/mod_productgroups/produkt_index_filter.phtml b/views/mods/mod_productgroups/produkt_index_filter.phtml
index 4804860..1455de4 100644
--- a/views/mods/mod_productgroups/produkt_index_filter.phtml
+++ b/views/mods/mod_productgroups/produkt_index_filter.phtml
@@ -7,5 +7,5 @@
 ?> 
 
 <?php if (is_array($this->view['productgroups']) && sizeof($this->view['productgroups']) > 0) { ?>
-<?php echo wpsg_drawForm_Select('productgroup', __('Produktgruppe', 'wpsg'), $this->view['arSelect'], wpsg_getStr($_REQUEST['productgroup'])); ?>
+<?php echo wpsg_drawForm_Select('search[pgruppe]', __('Produktgruppe', 'wpsg'), $this->view['arSelect'], wpsg_getStr($_REQUEST['search']['pgruppe'])); ?>
 <?php } ?>
\ No newline at end of file
diff --git a/views/produkt/index.phtml b/views/produkt/index.phtml
index 79223f5..6b94e9b 100644
--- a/views/produkt/index.phtml
+++ b/views/produkt/index.phtml
@@ -61,7 +61,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 __("Produktübersicht", "wpsg"); ?></a></li>
-					<li role="presentation" class="wpsg_showhide_filter <?php echo ((wpsg_isSizedString($_REQUEST['s']))?'active':''); ?>"><a href="#" onclick="return false;"><span class="glyphicon glyphicon-search"></span><?php echo __("Produktsuche", "wpsg"); ?></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 __("Produktsuche", "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">
@@ -72,10 +72,10 @@
 			 	</ul>			 	
 			</div>
 		</div>
-		<div class="wpsg-filter container-fluid form-horizontal" style="display:<?php echo ((wpsg_isSizedString($_REQUEST['s']))?'block':'none'); ?>;">
+		<div class="wpsg-filter container-fluid form-horizontal" style="display:<?php echo (($this->view['hasFilter'] === true)?'block':'none'); ?>;">
 			<div class="row">
 				<div class="col-lg-4">
-					<form method="POST" id="filter_form">
+					<form method="post" id="filter_form">
 					
 						<input id="wpsg_seite" type="hidden" name="seite" value="<?php echo $this->view['seite']; ?>" class="current-page" />
 						<input id="wpsg_order" type="hidden" name="search[order]" value="<?php echo $this->view['search']['order']; ?>" />
@@ -168,13 +168,13 @@
 					<td class="post-title wpsg_pic_col">
 						<?php 
 						
-							$arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($d['id'])); 
-						
-							if (wpsg_isSizedArray($arBilder))
+							$img = $this->callMod('wpsg_mod_produktbilder', 'getProductImage', array($d['id'], 40, 40, 'c'));
+						 
+							if ($img !== false)
 							{
 								
 								echo '<a href="'.WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&amp;action=edit&amp;edit_id='.$d['id'].'" title="'.wpsg_translate(__('Produkt für Sprache #1# bearbeiten.', 'wpsg'), $d['name']).'">';
-								echo '<img src="'.$this->callMod('wpsg_mod_produktbilder', 'makeTn', array($d['id'], $arBilder[0], 40, 40, 'c')).'" alt="" />';
+								echo '<img src="'.$img.'" alt="" />';
 								echo '</a>';
 								
 							}
@@ -228,11 +228,7 @@
 						<?php echo strtoupper($d['mwst_key']).' ('.wpsg_ff($d['mwst_value'], '%').' '.$this->getDefaultCountry()->kuerzel.')'; ?>					
 					</td>
 					<td>
-						<?php /* if ($this->get_option('wpsg_preisangaben') == WPSG_NETTO) { ?>
-						<?php echo wpsg_ff($d['preis_netto'], $this->get_option('wpsg_currency')); ?>
-						<?php } else { */?>
 						<?php echo wpsg_ff($d['preis'], $this->get_option('wpsg_currency')); ?>
-						<?php /* } */ ?>
 					</td>				
 				</tr>
 				<?php } ?>
-- 
cgit v1.2.3