Fix the location node setter properly

FOGProject · Jan 4, 2017 · b27a006 · b27a006
1 parent 9de3ed4
commit b27a006
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/packages/web/lib/fog/system.class.php b/packages/web/lib/fog/system.class.php
@@ -53,7 +53,7 @@ private static function _versionCompare()
     public function __construct()
     {
         self::_versionCompare();
-        define('FOG_VERSION', '1.3.0-RC-2');
+        define('FOG_VERSION', '1.3.1-RC-2');
         define('FOG_SCHEMA', 245);
         define('FOG_BCACHE_VER', 111);
         define('FOG_SVN_REVISION', 6052);

diff --git a/packages/web/lib/plugins/location/hooks/changeitems.hook.php b/packages/web/lib/plugins/location/hooks/changeitems.hook.php
@@ -169,8 +169,18 @@ public function bootItemSettings($arguments)
             ),
             'locationID'
         );
+        $Locations = self::getSubObjectIDs(
+            'Location',
+            array(
+                'id' => $Locations
+            )
+        );
+        $find = array(
+            'hostID' => $arguments['Host']->get('id'),
+            'locationID' => $Locations
+        );
         foreach ((array)self::getClass('LocationAssociationManager')
-            ->find(array('locationID' => $Locations)) as $Location
+            ->find($find) as $Location
         ) {
             if (!$Location->isTFTP()) {
                 continue;

diff --git a/packages/web/management/languages/messages.pot b/packages/web/management/languages/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-03 20:51-0500\n"
+"POT-Creation-Date: 2017-01-03 21:45-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"