partkeepr

commit f1aa2092f2b3097d4f0ccb61f2092c16540e844d
parent f9e751c1dfef519187d417876a608983359cb406
Author: Felicitus <felicitus@felicitus.org>
Date:   Fri, 16 Dec 2011 03:11:53 +0100

Additional fixes for the directory moves, setup/ and frontend/ should be completely moved by now.

Diffstat:
D
frontend/.htaccess
 | 
6
------
M
src/de/RaumZeitLabor/PartKeepr/Setup/FootprintSetup.php
 | 
2
+-
M
src/de/RaumZeitLabor/PartKeepr/Setup/ManufacturerSetup.php
 | 
4
++--
M
util/gen-jsb3-file.php
 | 
2
+-

4 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/frontend/.htaccess b/frontend/.htaccess
@@ -1,6 +0,0 @@
-AcceptPathInfo On
-
-    <Limit GET HEAD POST PUT DELETE OPTIONS>
-        Order Allow,Deny
-        Allow from all
-    </Limit>
diff --git a/src/de/RaumZeitLabor/PartKeepr/Setup/FootprintSetup.php b/src/de/RaumZeitLabor/PartKeepr/Setup/FootprintSetup.php
@@ -17,7 +17,7 @@ class FootprintSetup {
 	 */
 	private static $migratedFootprints = array();
 	
-	const FOOTPRINT_PATH = "../setup-data/footprints";
+	const FOOTPRINT_PATH = "../setup-data/footprints/";
 	const FOOTPRINT_FILE = "../setup-data/footprints/footprints.yaml";
 	
 	/**
diff --git a/src/de/RaumZeitLabor/PartKeepr/Setup/ManufacturerSetup.php b/src/de/RaumZeitLabor/PartKeepr/Setup/ManufacturerSetup.php
@@ -8,7 +8,7 @@ use	de\RaumZeitLabor\PartKeepr\PartKeepr,
 
 class ManufacturerSetup {
 	
-	const MANUFACTURER_IMAGE_PATH = "../setup-data/manufacturers/images/";
+	const MANUFACTURER_PATH 	  = "../setup-data/manufacturers/";
 	const MANUFACTURER_FILE 	  = "../setup-data/manufacturers/manufacturers.yaml";
 	
 	/**
@@ -30,7 +30,7 @@ class ManufacturerSetup {
 			foreach ($logos as $logo) {
 				$mfglogo = new ManufacturerICLogo();
 				$mfglogo->setManufacturer($manufacturer);
-				$mfglogo->replace(self::MANUFACTURER_PATH . $logo);
+				$mfglogo->replace(self::MANUFACTURER_PATH . "images/". $logo);
 				$mfglogo->setOriginalFilename($logo);
 		
 				PartKeepr::getEM()->persist($mfglogo);
diff --git a/util/gen-jsb3-file.php b/util/gen-jsb3-file.php
@@ -86,7 +86,7 @@ foreach ($records as $key => $record) {
 	
 	if (!$bHasRequires) {
 		/* Hardcoded check for i18n, as it isn't a class but a script, and needs to put in front of everything */
-		if ($record->getFilename() == "frontend/js/Util/i18n.js" || $record->getFilename() == "frontend/js/PartKeepr.js" || $record->getFilename() == "frontend/js/Util/JsonWithAssociationsWriter.js") {
+		if ($record->getFilename() == "src/frontend/js/Util/i18n.js" || $record->getFilename() == "src/frontend/js/PartKeepr.js" || $record->getFilename() == "src/frontend/js/Util/JsonWithAssociationsWriter.js") {
 			array_unshift($rootList, $record);
 		} else {
 			$rootList[] = $record;