Changeset 12213 for extensions

Timestamp:

Sep 24, 2011, 12:05:07 PM (13 years ago)

Author:

grum

Message:

fix bugs
bug:2042 - Category map is not available if option "apply to subcategories" is not selected

Location:

extensions/GMaps

Files:

• gmaps_pip.class.inc.php (modified) (1 diff)
• gmaps_root.class.inc.php (modified) (2 diffs)
• js/gmapsInfoWindow.js (modified) (1 diff)
• js/gmapsInfoWindow.min.js (modified) (1 diff)
• main.inc.php (modified) (2 diffs)

extensions/GMaps/gmaps_pip.class.inc.php

@@ -297 +297 @@
       boundmap:'".l10n('gmaps_i_boundmap')."',
       boundkml:'".l10n('gmaps_i_boundkml')."',
-      loading:'".l10n('gmaps_loading')."'
+      loading:'".l10n('gmaps_loading')."',
+      gmaps_i_show_this_picture_in:'".l10n('gmaps_i_show_this_picture_in')."'
     },
     requestId:'',

extensions/GMaps/gmaps_root.class.inc.php

@@ -235 +235 @@
         if($id!=0)
         {
-          $sql.=" AND pct.id = '$id' ";
+          $sql.=" AND (pgcm.categoryId ='$id' or pct.id!='$id' AND pgcm.applySubCat='y') ";
         }
         else
         {
-          $sql.=" AND pgcm.categoryId = 0 ";
+          $sql.=" AND pgcm.categoryId = 0 AND pgcm.applySubCat='y' ";
         }
-        $sql.=" AND pgcm.applySubCat='y'
-              ORDER BY priorityRank DESC, pgmm.displayType ASC, pgcm.categoryId ASC, pgcm.imgSort ASC;";
+        $sql.=" ORDER BY priorityRank DESC, pgmm.displayType ASC, pgcm.categoryId ASC, pgcm.imgSort ASC;";
       }
       elseif($mode==self::ID_MODE_MAP)
@@ -259 +258 @@
         return(false);
       }
-
       $result=pwg_query($sql);
 

extensions/GMaps/js/gmapsInfoWindow.js

@@ -93 +93 @@
                                               ).append($('<span/>',
                                                           {
-                                                            html:'gmaps_i_show_this_picture_in'
+                                                            html:gmaps.lang.gmaps_i_show_this_picture_in
                                                           }
                                                         )

extensions/GMaps/js/gmapsInfoWindow.min.js

@@ -1 +1 @@
 /* file: gmapsInfoWindow.js - v1.0.0 | minified on 2011/09/23 with http://jscompress.com/ */
-function initInfoWindow(){if($("#iGMapsInfoWindow").length==0){$("body").append($("<div/>",{id:"iGMapsInfoWindow",css:{display:"none"}}).append($("<div/>",{id:"iGMapsInfoWindowContent"}).append($("<div/>",{id:"iGMIWC_title",html:"(title)"})).append($("<table/>",{id:"iGMIWC_thumb"}).append($("<tr/>").append($("<td/>",{css:{width:"28px"}}).append($('<div id="iWALeft"/>'))).append($("<td/>").append($("<img/>",{id:"iGMIWC_img",src:""}))).append($("<td/>",{css:{width:"28px"}}).append($('<div id="iWARight">'))))).append($("<div/>",{id:"iGMIWC_picnum",html:"0/0 photo"})).append($("<div/>",{id:"iGMIWC_showcat",css:{display:"none"}}).append($("<span/>",{html:"gmaps_i_show_this_picture_in"})).append($("<ul/>",{id:"iGMIWC_showcatList"})))))}}
+function initInfoWindow(){if($("#iGMapsInfoWindow").length==0){$("body").append($("<div/>",{id:"iGMapsInfoWindow",css:{display:"none"}}).append($("<div/>",{id:"iGMapsInfoWindowContent"}).append($("<div/>",{id:"iGMIWC_title",html:"(title)"})).append($("<table/>",{id:"iGMIWC_thumb"}).append($("<tr/>").append($("<td/>",{css:{width:"28px"}}).append($('<div id="iWALeft"/>'))).append($("<td/>").append($("<img/>",{id:"iGMIWC_img",src:""}))).append($("<td/>",{css:{width:"28px"}}).append($('<div id="iWARight">'))))).append($("<div/>",{id:"iGMIWC_picnum",html:"0/0 photo"})).append($("<div/>",{id:"iGMIWC_showcat",css:{display:"none"}}).append($("<span/>",{html:gmaps.lang.gmaps_i_show_this_picture_in})).append($("<ul/>",{id:"iGMIWC_showcatList"})))))}}

extensions/GMaps/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: GMaps
-Version: 1.3.1
+Version: 1.3.2
 Description: Display and manage (google) maps
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=454
@@ -116 +116 @@
 |         |            |     in Gmaps plugin manager
 |         |            |
+|         |            | * mantis bug:2042
+|         |            |   . Category map is not available if option "apply to
+|         |            |     subcategories" is not selected
 |         |            |
 |         |            |