leon 01/06/21 10:33:20
Modified: freetrade2/modules/action ADD_ATTRIBUTE ADD_ITEM
ADD_VARIATION DELETE_ATTRIBUTE DELETE_VARIATION
UPDATE_ATTRIBUTE UPDATE_VARIATION
freetrade2/modules/database/mysql attribute
freetrade2/modules/utility standard_library
Log:
Bug fixes from Kevin Leavell
Revision Changes Path
1.4 +6 -3 freetrade/freetrade2/modules/action/ADD_ATTRIBUTE
Index: ADD_ATTRIBUTE
===================================================================
RCS file: /home/cvs/freetrade/freetrade2/modules/action/ADD_ATTRIBUTE,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ADD_ATTRIBUTE 2000/11/08 00:54:09 1.3
+++ ADD_ATTRIBUTE 2001/06/21 17:33:19 1.4
@@ -2,14 +2,17 @@
/*
** File: ADD_ATTRIBUTE
** Description: Adds an attribute to the database
- ** Version: $Revision: 1.3 $
+ ** Version: $Revision: 1.4 $
** Created: 04/21/1999
** Author: Leon Atkinson
** Email: [EMAIL PROTECTED]
** CVS Author: $Author: leon $
- ** Last Revised: $Date: 2000/11/08 00:54:09 $
+ ** Last Revised: $Date: 2001/06/21 17:33:19 $
**
** Log : $Log: ADD_ATTRIBUTE,v $
+ ** Log : Revision 1.4 2001/06/21 17:33:19 leon
+ ** Log : Bug fixes from Kevin Leavell
+ ** Log :
** Log : Revision 1.3 2000/11/08 00:54:09 leon
** Log : *** empty log message ***
** Log :
@@ -31,7 +34,7 @@
}
//get attribute functions
- include_once(MODULE . "utility/attribute");
+ include_once(DATABASE_MODULE . "attribute");
if(!createAttribute($inputName, $inputGraphic, $inputDisplayPrecedence,
$error))
{
1.7 +14 -2 freetrade/freetrade2/modules/action/ADD_ITEM
Index: ADD_ITEM
===================================================================
RCS file: /home/cvs/freetrade/freetrade2/modules/action/ADD_ITEM,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ADD_ITEM 2000/11/08 00:54:10 1.6
+++ ADD_ITEM 2001/06/21 17:33:19 1.7
@@ -2,14 +2,17 @@
/*
** File: ADD_ITEM
** Description: Adds an item to the database
- ** Version: $Revision: 1.6 $
+ ** Version: $Revision: 1.7 $
** Created: 04/08/1999
** Author: Leon Atkinson, Shannon -jj Behrens
** Email: [EMAIL PROTECTED], [EMAIL PROTECTED]
** CVS Author: $Author: leon $
- ** Last Revised: $Date: 2000/11/08 00:54:10 $
+ ** Last Revised: $Date: 2001/06/21 17:33:19 $
**
** Log : $Log: ADD_ITEM,v $
+ ** Log : Revision 1.7 2001/06/21 17:33:19 leon
+ ** Log : Bug fixes from Kevin Leavell
+ ** Log :
** Log : Revision 1.6 2000/11/08 00:54:10 leon
** Log : *** empty log message ***
** Log :
@@ -29,6 +32,15 @@
** Log :
**
** Copyright (c) 1999 Working Dogs. All rights reserved.
+ */
+
+ /*
+ ** TODO:
+ ** Add code that stops you from making an item active if
+ ** it has no active SKUs. This also requires code in the
+ ** SKU actions that forces an item to be active if it DOES
+ ** have active SKUs.
+ **
*/
/*
1.4 +6 -3 freetrade/freetrade2/modules/action/ADD_VARIATION
Index: ADD_VARIATION
===================================================================
RCS file: /home/cvs/freetrade/freetrade2/modules/action/ADD_VARIATION,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ADD_VARIATION 2000/11/08 00:54:10 1.3
+++ ADD_VARIATION 2001/06/21 17:33:19 1.4
@@ -2,14 +2,17 @@
/*
** File: ADD_VARIATION
** Description: Adds a variation to the database
- ** Version: $Revision: 1.3 $
+ ** Version: $Revision: 1.4 $
** Created: 04/21/1999
** Author: Leon Atkinson
** Email: [EMAIL PROTECTED]
** CVS Author: $Author: leon $
- ** Last Revised: $Date: 2000/11/08 00:54:10 $
+ ** Last Revised: $Date: 2001/06/21 17:33:19 $
**
** Log : $Log: ADD_VARIATION,v $
+ ** Log : Revision 1.4 2001/06/21 17:33:19 leon
+ ** Log : Bug fixes from Kevin Leavell
+ ** Log :
** Log : Revision 1.3 2000/11/08 00:54:10 leon
** Log : *** empty log message ***
** Log :
@@ -28,7 +31,7 @@
}
// get attribute functions
- include_once(MODULE . "utility/attribute");
+ include_once(DATABASE_MODULE . "attribute");
if(!createVariation($attribute, $inputName, $inputDescription,
$inputGraphic, $inputDisplayPrecedence, $error))
1.4 +6 -3 freetrade/freetrade2/modules/action/DELETE_ATTRIBUTE
Index: DELETE_ATTRIBUTE
===================================================================
RCS file: /home/cvs/freetrade/freetrade2/modules/action/DELETE_ATTRIBUTE,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DELETE_ATTRIBUTE 2000/11/08 00:54:11 1.3
+++ DELETE_ATTRIBUTE 2001/06/21 17:33:19 1.4
@@ -2,14 +2,17 @@
/*
** File: DELETE_ATTRIBUTE
** Description: Removes an attribute
- ** Version: $Revision: 1.3 $
+ ** Version: $Revision: 1.4 $
** Created: 04/21/1999
** Author: Leon Atkinson
** Email: [EMAIL PROTECTED]
** CVS Author: $Author: leon $
- ** Last Revised: $Date: 2000/11/08 00:54:11 $
+ ** Last Revised: $Date: 2001/06/21 17:33:19 $
**
** Log : $Log: DELETE_ATTRIBUTE,v $
+ ** Log : Revision 1.4 2001/06/21 17:33:19 leon
+ ** Log : Bug fixes from Kevin Leavell
+ ** Log :
** Log : Revision 1.3 2000/11/08 00:54:11 leon
** Log : *** empty log message ***
** Log :
@@ -31,7 +34,7 @@
}
//get attribute functions
- include_once(MODULE . "utility/attribute");
+ include_once(DATABASE_MODULE . "attribute");
if(!deleteAttribute($attribute, $error))
{
1.4 +6 -3 freetrade/freetrade2/modules/action/DELETE_VARIATION
Index: DELETE_VARIATION
===================================================================
RCS file: /home/cvs/freetrade/freetrade2/modules/action/DELETE_VARIATION,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DELETE_VARIATION 2000/11/08 00:54:11 1.3
+++ DELETE_VARIATION 2001/06/21 17:33:19 1.4
@@ -2,14 +2,17 @@
/*
** File: DELETE_VARIATION
** Description: Removes a variation
- ** Version: $Revision: 1.3 $
+ ** Version: $Revision: 1.4 $
** Created: 04/21/1999
** Author: Leon Atkinson
** Email: [EMAIL PROTECTED]
** CVS Author: $Author: leon $
- ** Last Revised: $Date: 2000/11/08 00:54:11 $
+ ** Last Revised: $Date: 2001/06/21 17:33:19 $
**
** Log : $Log: DELETE_VARIATION,v $
+ ** Log : Revision 1.4 2001/06/21 17:33:19 leon
+ ** Log : Bug fixes from Kevin Leavell
+ ** Log :
** Log : Revision 1.3 2000/11/08 00:54:11 leon
** Log : *** empty log message ***
** Log :
@@ -28,7 +31,7 @@
}
// get attribute functions
- include_once(MODULE . "utility/attribute");
+ include_once(DATABASE_MODULE . "attribute");
if(!deleteVariation($variation, $error))
{
1.4 +6 -3 freetrade/freetrade2/modules/action/UPDATE_ATTRIBUTE
Index: UPDATE_ATTRIBUTE
===================================================================
RCS file: /home/cvs/freetrade/freetrade2/modules/action/UPDATE_ATTRIBUTE,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UPDATE_ATTRIBUTE 2000/11/08 00:54:14 1.3
+++ UPDATE_ATTRIBUTE 2001/06/21 17:33:19 1.4
@@ -2,14 +2,17 @@
/*
** File: UPDATE_ATTRIBUTE
** Description: update information about an attribute
- ** Version: $Revision: 1.3 $
+ ** Version: $Revision: 1.4 $
** Created: 04/21/1999
** Author: Leon Atkinson
** Email: [EMAIL PROTECTED]
** CVS Author: $Author: leon $
- ** Last Revised: $Date: 2000/11/08 00:54:14 $
+ ** Last Revised: $Date: 2001/06/21 17:33:19 $
**
** Log : $Log: UPDATE_ATTRIBUTE,v $
+ ** Log : Revision 1.4 2001/06/21 17:33:19 leon
+ ** Log : Bug fixes from Kevin Leavell
+ ** Log :
** Log : Revision 1.3 2000/11/08 00:54:14 leon
** Log : *** empty log message ***
** Log :
@@ -31,7 +34,7 @@
}
//get attribute functions
- include_once(MODULE . "utility/attribute");
+ include_once(DATABASE_MODULE . "attribute");
if(!updateAttribute($attribute, $inputName, $inputGraphic,
$inputDisplayPrecedence, $error))
1.4 +6 -3 freetrade/freetrade2/modules/action/UPDATE_VARIATION
Index: UPDATE_VARIATION
===================================================================
RCS file: /home/cvs/freetrade/freetrade2/modules/action/UPDATE_VARIATION,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UPDATE_VARIATION 2000/11/08 00:54:15 1.3
+++ UPDATE_VARIATION 2001/06/21 17:33:19 1.4
@@ -2,14 +2,17 @@
/*
** File: UPDATE_VARIATION
** Description: update information about a variation
- ** Version: $Revision: 1.3 $
+ ** Version: $Revision: 1.4 $
** Created: 04/21/1999
** Author: Leon Atkinson
** Email: [EMAIL PROTECTED]
** CVS Author: $Author: leon $
- ** Last Revised: $Date: 2000/11/08 00:54:15 $
+ ** Last Revised: $Date: 2001/06/21 17:33:19 $
**
** Log : $Log: UPDATE_VARIATION,v $
+ ** Log : Revision 1.4 2001/06/21 17:33:19 leon
+ ** Log : Bug fixes from Kevin Leavell
+ ** Log :
** Log : Revision 1.3 2000/11/08 00:54:15 leon
** Log : *** empty log message ***
** Log :
@@ -27,7 +30,7 @@
return(FALSE);
}
- include_once(MODULE . "utility/attribute");
+ include_once(DATABASE_MODULE . "attribute");
//execute query
if(!updateVariation($variation, $inputName, $inputDescription,
1.3 +8 -6 freetrade/freetrade2/modules/database/mysql/attribute
Index: attribute
===================================================================
RCS file: /home/cvs/freetrade/freetrade2/modules/database/mysql/attribute,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- attribute 2000/11/08 00:54:28 1.2
+++ attribute 2001/06/21 17:33:20 1.3
@@ -6,9 +6,12 @@
** Author: Leon Atkinson
** Email: [EMAIL PROTECTED]
** CVS Author: $Author: leon $
- ** Last Revised: $Date: 2000/11/08 00:54:28 $
+ ** Last Revised: $Date: 2001/06/21 17:33:20 $
**
** Log : $Log: attribute,v $
+ ** Log : Revision 1.3 2001/06/21 17:33:20 leon
+ ** Log : Bug fixes from Kevin Leavell
+ ** Log :
** Log : Revision 1.2 2000/11/08 00:54:28 leon
** Log : *** empty log message ***
** Log :
@@ -222,7 +225,7 @@
global $DatabaseLink;
//force precedence to be a number
- $inputDisplayPrecedence = (integer)$inputDisplayPrecedence;
+ $DisplayPrecedence = (integer)$DisplayPrecedence;
//trim strings
$Name = trim($Name);
@@ -241,10 +244,9 @@
"'" . substr(addslashes($Name), 0, 255) . "', " .
"'" . substr(addslashes($Graphic), 0, 255) . "', " .
"$DisplayPrecedence) ";
-
if(!($DatabaseResult = mysql_query($Query, $DatabaseLink)))
{
- addToLog("Couldn't get list of variations!",
+ addToLog("Couldn't insert variation!",
LOG_ANNOYANCE, __FILE__, __LINE__);
$error = "Insert failed!";
return(FALSE);
@@ -421,7 +423,7 @@
$Query = "INSERT INTO variation (Attribute, Name, Description, " .
"Graphic, DisplayPrecedence) " .
"VALUES (" .
- "$Attribute, ";
+ "$Attribute, " .
"'" . addslashes($Name) . "', " .
"'" . addslashes($Description) . "', " .
"'" . addslashes($Graphic) . "', " .
@@ -531,4 +533,4 @@
-?>
\ No newline at end of file
+?>
1.17 +6 -3 freetrade/freetrade2/modules/utility/standard_library
Index: standard_library
===================================================================
RCS file: /home/cvs/freetrade/freetrade2/modules/utility/standard_library,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- standard_library 2000/08/23 20:32:58 1.16
+++ standard_library 2001/06/21 17:33:20 1.17
@@ -6,13 +6,16 @@
** 75% of all page views. Most of these functions were in global_settings
** at one time.
**
- ** Version: $Revision: 1.16 $
+ ** Version: $Revision: 1.17 $
** Created: 10/4/99
** Author: Leon Atkinson
** Email: [EMAIL PROTECTED]
** CVS Author: $Author: leon $
- ** Last Revised: $Date: 2000/08/23 20:32:58 $
+ ** Last Revised: $Date: 2001/06/21 17:33:20 $
** Log : $Log: standard_library,v $
+ ** Log : Revision 1.17 2001/06/21 17:33:20 leon
+ ** Log : Bug fixes from Kevin Leavell
+ ** Log :
** Log : Revision 1.16 2000/08/23 20:32:58 leon
** Log : Screens for admin of relationships done
** Log :
@@ -548,7 +551,7 @@
** Description: Outputs a table row to allow a user to edit a particular
** field. Uses prepareText() when outputing $value.
*/
- function printEditRow($label, $field, $value, $size=32, $max=FALSE,
$type="text")
+ function printEditRow($label, $field, $value='', $size=32, $max=FALSE,
$type="text")
{
print(getEditRow($label, $field, $value, $size, $max, $type));
}
_______________________________________________
FreeTrade-dev mailing list
[EMAIL PROTECTED]
http://share.whichever.com/mailman/listinfo/freetrade-dev
