cs-project-svn_notify Mailing List for CS-Project (Page 14)
Brought to you by:
crazedsanity
You can subscribe to this list here.
2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(65) |
Dec
(47) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2008 |
Jan
(34) |
Feb
(82) |
Mar
(21) |
Apr
(12) |
May
(16) |
Jun
|
Jul
(6) |
Aug
(8) |
Sep
|
Oct
|
Nov
|
Dec
|
2009 |
Jan
(1) |
Feb
(52) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(9) |
Aug
(5) |
Sep
(12) |
Oct
(11) |
Nov
(4) |
Dec
(15) |
2010 |
Jan
|
Feb
|
Mar
(6) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(9) |
2012 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
From: <cra...@us...> - 2007-12-27 00:07:51
|
Revision: 716 http://cs-project.svn.sourceforge.net/cs-project/?rev=716&view=rev Author: crazedsanity Date: 2007-12-26 16:07:36 -0800 (Wed, 26 Dec 2007) Log Message: ----------- *** RELEASE 1.1.0 *** SUMMARY OF CHANGES: * Cannot modify tags on closed issues. * Formatting of helpdesk issue body & notes without "pre" tags. * admin interface for tags, updated tag listing * Ordering options for tags, ability to change modifier for tag name. * Folder for icons from "Sweetie-BasePack-v3" * Help system (mostly just for the Helpdesk). * Status messages show icon in title for prettiness. :) * After re-linking an issue, message now shows link back to previous project. * Fix header (of SQL files) to have proper SVN keywords & such. * Ability to change helpdesk issue name (issue #70). * Fix order of tags when viewing issue (#123). * Fix initial priority based on tag modifier (#77). * Display ancestry link list instead of just project name on summary (#101). * Use block rows to display input or text for open/closed issue (#119). * Display currently logged-in user (#71). * Implement newest version of cs-content (0.10.6) * External helpdesk remembers contact_id/email * Better internal error handling & reporting * Tag modifiers affect initial issue priority * "Bug" auto-selected for new issues. * Remove "Stall" option for issues (status not properly handled anyway) * Enhanced email alerts, handle errors when sending * BBCode implemented! * Options for sending email locally vs. via SMTP (must be manually set) * AuthToken system for handling temporary authentication (lost passwords) * Helpdesk displays "Notified Users" list * Use real cookies (ones that last after browser is closed) * Javascript goodness for changing issue/project details * Updated documentation for developers & such * Use magic "__autoload()" function for class inclusions * Updates & bugfixes to upgrade system * Contacts can have multiple email address (one is always primary) * Automatic exception logging * More logging, better format of log details SVN COMMAND: merge -r713:HEAD https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk Modified Paths: -------------- releases/1.1/VERSION releases/1.1/includes/content/helpdesk.inc releases/1.1/templates/content/helpdesk/view.content.tmpl Modified: releases/1.1/VERSION =================================================================== --- releases/1.1/VERSION 2007-12-27 00:05:57 UTC (rev 715) +++ releases/1.1/VERSION 2007-12-27 00:07:36 UTC (rev 716) @@ -1,4 +1,4 @@ $Id:VERSION 628 2007-11-20 16:58:45Z crazedsanity $ -VERSION: 1.1.0-RC1 +VERSION: 1.1.0 $HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/VERSION $ Modified: releases/1.1/includes/content/helpdesk.inc =================================================================== --- releases/1.1/includes/content/helpdesk.inc 2007-12-27 00:05:57 UTC (rev 715) +++ releases/1.1/includes/content/helpdesk.inc 2007-12-27 00:07:36 UTC (rev 716) @@ -278,14 +278,16 @@ //if they're the owner, show the "solution" section. $assignedStr = $helpdeskData['leader_contact_id']; if($helpdeskData['status_id'] == 4) { - //allow the current user to re-open this issue. + //CLOSED: allow the current user to re-open this issue. $doNotRipRows[] = "assigned_text"; $doNotRipRows[] = "priority_text"; $doNotRipRows[] = "reopen_button"; } else { + //NOT closed... $doNotRipRows[] = "assigned_optionList"; $doNotRipRows[] = "priority_optionList"; + $doNotRipRows[] = "editable_tags"; if(($assignedStr == $_SESSION['contact_id']) || ($assignedStr == "" || is_null($assignedStr))) { //well, we can show 'em the update/modify button. $doNotRipRows[] = "update_button"; @@ -353,7 +355,14 @@ $myTagList = $proj->tagObj->get_tags_for_record($helpdeskData['record_id']); if(is_array($myTagList)) { - $baseRow = $page->templateRows['removeable_tag']; + if($helpdeskData['status_id'] == 4) { + $tagListVar = 'text_tags'; + $baseRow = $page->templateRows['text_tags']; + } + else { + $tagListVar = 'removeable_tag'; + $baseRow = $page->templateRows['removeable_tag']; + } $myTagRow = ""; $tCount = 0; foreach($myTagList as $tagNameId=>$tagName) { @@ -371,12 +380,8 @@ ); $myTagRow .= mini_parser($baseRow, $repArr, '%%', '%%'); } + $page->add_template_var($tagListVar, $myTagRow); } - else { - //tell 'em there's no tags! - $myTagRow = ""; - } - $page->add_template_var('removeable_tag', $myTagRow); //Display tags that can be added. $availableTagsList = $proj->tagObj->get_available_tags_for_record($helpdeskData['record_id'], 3); Modified: releases/1.1/templates/content/helpdesk/view.content.tmpl =================================================================== --- releases/1.1/templates/content/helpdesk/view.content.tmpl 2007-12-27 00:05:57 UTC (rev 715) +++ releases/1.1/templates/content/helpdesk/view.content.tmpl 2007-12-27 00:07:36 UTC (rev 716) @@ -149,19 +149,24 @@ </th> <td colspan="2"> + <!-- BEGIN editable_tags --> <!-- BEGIN removeable_tag --><a href="/content/tags/remove/%%tag_name_id%%/{record_id}">%%name%%</a>%%separator%% <!-- END removeable_tag --> - - <BR> - + + <BR> + <select> <!-- BEGIN addTag_option --> <option value='%%value%%'%%selectedString%% onClick="location.href='/content/tags/add/%%value%%/{record_id}'">%%display%%</option> <!-- END addTag_option --> {add_tag_list} </select> <i><font color="red">(NOTE: this will *immediately* add a tag -- don't do it if you've changed something!)</font></i><BR> - <input type="text" name="newTag" value=""><input type="button" value="Add New Tag" - onClick="this.value='Creating Tag...';document.main.newTag.readonly=true;document.hiddenAddTagForm.new_tag.value=document.main.newTag.value;document.hiddenAddTagForm.submit()"></td> + <input type="text" name="newTag" value=""><input type="button" value="Add New Tag" + onClick="this.value='Creating Tag...';document.main.newTag.readonly=true;document.hiddenAddTagForm.new_tag.value=document.main.newTag.value;document.hiddenAddTagForm.submit()"> + <!-- END editable_tags --> + <!-- BEGIN text_tags --><b>%%name%%</b>%%separator%% + <!-- END text_tags --> + </td> </tr> <tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-27 00:06:02
|
Revision: 715 http://cs-project.svn.sourceforge.net/cs-project/?rev=715&view=rev Author: crazedsanity Date: 2007-12-26 16:05:57 -0800 (Wed, 26 Dec 2007) Log Message: ----------- *** RELEASE 1.1.0 *** SUMMARY OF CHANGES: * Cannot modify tags on closed issues. * Formatting of helpdesk issue body & notes without "pre" tags. * admin interface for tags, updated tag listing * Ordering options for tags, ability to change modifier for tag name. * Folder for icons from "Sweetie-BasePack-v3" * Help system (mostly just for the Helpdesk). * Status messages show icon in title for prettiness. :) * After re-linking an issue, message now shows link back to previous project. * Fix header (of SQL files) to have proper SVN keywords & such. * Ability to change helpdesk issue name (issue #70). * Fix order of tags when viewing issue (#123). * Fix initial priority based on tag modifier (#77). * Display ancestry link list instead of just project name on summary (#101). * Use block rows to display input or text for open/closed issue (#119). * Display currently logged-in user (#71). * Implement newest version of cs-content (0.10.6) * External helpdesk remembers contact_id/email * Better internal error handling & reporting * Tag modifiers affect initial issue priority * "Bug" auto-selected for new issues. * Remove "Stall" option for issues (status not properly handled anyway) * Enhanced email alerts, handle errors when sending * BBCode implemented! * Options for sending email locally vs. via SMTP (must be manually set) * AuthToken system for handling temporary authentication (lost passwords) * Helpdesk displays "Notified Users" list * Use real cookies (ones that last after browser is closed) * Javascript goodness for changing issue/project details * Updated documentation for developers & such * Use magic "__autoload()" function for class inclusions * Updates & bugfixes to upgrade system * Contacts can have multiple email address (one is always primary) * Automatic exception logging * More logging, better format of log details Modified Paths: -------------- trunk/VERSION Modified: trunk/VERSION =================================================================== --- trunk/VERSION 2007-12-27 00:04:23 UTC (rev 714) +++ trunk/VERSION 2007-12-27 00:05:57 UTC (rev 715) @@ -1,4 +1,4 @@ $Id:VERSION 628 2007-11-20 16:58:45Z crazedsanity $ -VERSION: 1.1.0-RC1 +VERSION: 1.1.0 $HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/VERSION $ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-27 00:04:27
|
Revision: 714 http://cs-project.svn.sourceforge.net/cs-project/?rev=714&view=rev Author: crazedsanity Date: 2007-12-26 16:04:23 -0800 (Wed, 26 Dec 2007) Log Message: ----------- Remove ability to add/remove tags on closed issues (#119). Modified Paths: -------------- trunk/includes/content/helpdesk.inc trunk/templates/content/helpdesk/view.content.tmpl Modified: trunk/includes/content/helpdesk.inc =================================================================== --- trunk/includes/content/helpdesk.inc 2007-12-19 18:52:52 UTC (rev 713) +++ trunk/includes/content/helpdesk.inc 2007-12-27 00:04:23 UTC (rev 714) @@ -278,14 +278,16 @@ //if they're the owner, show the "solution" section. $assignedStr = $helpdeskData['leader_contact_id']; if($helpdeskData['status_id'] == 4) { - //allow the current user to re-open this issue. + //CLOSED: allow the current user to re-open this issue. $doNotRipRows[] = "assigned_text"; $doNotRipRows[] = "priority_text"; $doNotRipRows[] = "reopen_button"; } else { + //NOT closed... $doNotRipRows[] = "assigned_optionList"; $doNotRipRows[] = "priority_optionList"; + $doNotRipRows[] = "editable_tags"; if(($assignedStr == $_SESSION['contact_id']) || ($assignedStr == "" || is_null($assignedStr))) { //well, we can show 'em the update/modify button. $doNotRipRows[] = "update_button"; @@ -353,7 +355,14 @@ $myTagList = $proj->tagObj->get_tags_for_record($helpdeskData['record_id']); if(is_array($myTagList)) { - $baseRow = $page->templateRows['removeable_tag']; + if($helpdeskData['status_id'] == 4) { + $tagListVar = 'text_tags'; + $baseRow = $page->templateRows['text_tags']; + } + else { + $tagListVar = 'removeable_tag'; + $baseRow = $page->templateRows['removeable_tag']; + } $myTagRow = ""; $tCount = 0; foreach($myTagList as $tagNameId=>$tagName) { @@ -371,12 +380,8 @@ ); $myTagRow .= mini_parser($baseRow, $repArr, '%%', '%%'); } + $page->add_template_var($tagListVar, $myTagRow); } - else { - //tell 'em there's no tags! - $myTagRow = ""; - } - $page->add_template_var('removeable_tag', $myTagRow); //Display tags that can be added. $availableTagsList = $proj->tagObj->get_available_tags_for_record($helpdeskData['record_id'], 3); Modified: trunk/templates/content/helpdesk/view.content.tmpl =================================================================== --- trunk/templates/content/helpdesk/view.content.tmpl 2007-12-19 18:52:52 UTC (rev 713) +++ trunk/templates/content/helpdesk/view.content.tmpl 2007-12-27 00:04:23 UTC (rev 714) @@ -149,19 +149,24 @@ </th> <td colspan="2"> + <!-- BEGIN editable_tags --> <!-- BEGIN removeable_tag --><a href="/content/tags/remove/%%tag_name_id%%/{record_id}">%%name%%</a>%%separator%% <!-- END removeable_tag --> - - <BR> - + + <BR> + <select> <!-- BEGIN addTag_option --> <option value='%%value%%'%%selectedString%% onClick="location.href='/content/tags/add/%%value%%/{record_id}'">%%display%%</option> <!-- END addTag_option --> {add_tag_list} </select> <i><font color="red">(NOTE: this will *immediately* add a tag -- don't do it if you've changed something!)</font></i><BR> - <input type="text" name="newTag" value=""><input type="button" value="Add New Tag" - onClick="this.value='Creating Tag...';document.main.newTag.readonly=true;document.hiddenAddTagForm.new_tag.value=document.main.newTag.value;document.hiddenAddTagForm.submit()"></td> + <input type="text" name="newTag" value=""><input type="button" value="Add New Tag" + onClick="this.value='Creating Tag...';document.main.newTag.readonly=true;document.hiddenAddTagForm.new_tag.value=document.main.newTag.value;document.hiddenAddTagForm.submit()"> + <!-- END editable_tags --> + <!-- BEGIN text_tags --><b>%%name%%</b>%%separator%% + <!-- END text_tags --> + </td> </tr> <tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-19 18:53:00
|
Revision: 713 http://cs-project.svn.sourceforge.net/cs-project/?rev=713&view=rev Author: crazedsanity Date: 2007-12-19 10:52:52 -0800 (Wed, 19 Dec 2007) Log Message: ----------- *** RELEASE 1.1.0-RC1 *** SUMMARY OF CHANGES: * Formatting of helpdesk issue body & notes without "pre" tags. * admin interface for tags, updated tag listing * Ordering options for tags, ability to change modifier for tag name. * Folder for icons from "Sweetie-BasePack-v3" * Help system (mostly just for the Helpdesk). * Status messages show icon in title for prettiness. :) * After re-linking an issue, message now shows link back to previous project. * Fix header (of SQL files) to have proper SVN keywords & such. * Ability to change helpdesk issue name (issue #70). * Fix order of tags when viewing issue (#123). * Fix initial priority based on tag modifier (#77). * Display ancestry link list instead of just project name on summary (#101). * Use block rows to display input or text for open/closed issue (#119). * Display currently logged-in user (#71). * Implement newest version of cs-content (0.10.6) * External helpdesk remembers contact_id/email * Better internal error handling & reporting * Tag modifiers affect initial issue priority * "Bug" auto-selected for new issues. * Remove "Stall" option for issues (status not properly handled anyway) * Enhanced email alerts, handle errors when sending * BBCode implemented! * Options for sending email locally vs. via SMTP (must be manually set) * AuthToken system for handling temporary authentication (lost passwords) * Helpdesk displays "Notified Users" list * Use real cookies (ones that last after browser is closed) * Javascript goodness for changing issue/project details * Updated documentation for developers & such * Use magic "__autoload()" function for class inclusions * Updates & bugfixes to upgrade system * Contacts can have multiple email address (one is always primary) * Automatic exception logging * More logging, better format of log details NOTE: this also contains two documents that didn't get added in the last commit when cs-content was updated (non-essential files). Modified Paths: -------------- releases/1.1/VERSION Added Paths: ----------- releases/1.1/lib/cs-content/documentation/source/why_templating.odt releases/1.1/lib/cs-content/documentation/why_templating.pdf Modified: releases/1.1/VERSION =================================================================== --- releases/1.1/VERSION 2007-12-19 18:49:52 UTC (rev 712) +++ releases/1.1/VERSION 2007-12-19 18:52:52 UTC (rev 713) @@ -1,4 +1,4 @@ $Id:VERSION 628 2007-11-20 16:58:45Z crazedsanity $ -VERSION: 1.1.0-BETA16 +VERSION: 1.1.0-RC1 $HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/VERSION $ Added: releases/1.1/lib/cs-content/documentation/source/why_templating.odt =================================================================== (Binary files differ) Property changes on: releases/1.1/lib/cs-content/documentation/source/why_templating.odt ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: releases/1.1/lib/cs-content/documentation/why_templating.pdf =================================================================== (Binary files differ) Property changes on: releases/1.1/lib/cs-content/documentation/why_templating.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-19 18:49:55
|
Revision: 712 http://cs-project.svn.sourceforge.net/cs-project/?rev=712&view=rev Author: crazedsanity Date: 2007-12-19 10:49:52 -0800 (Wed, 19 Dec 2007) Log Message: ----------- *** RELEASE 1.1.0-RC1 *** SUMMARY OF CHANGES: * Formatting of helpdesk issue body & notes without "pre" tags. * admin interface for tags, updated tag listing * Ordering options for tags, ability to change modifier for tag name. * Folder for icons from "Sweetie-BasePack-v3" * Help system (mostly just for the Helpdesk). * Status messages show icon in title for prettiness. :) * After re-linking an issue, message now shows link back to previous project. * Fix header (of SQL files) to have proper SVN keywords & such. * Ability to change helpdesk issue name (issue #70). * Fix order of tags when viewing issue (#123). * Fix initial priority based on tag modifier (#77). * Display ancestry link list instead of just project name on summary (#101). * Use block rows to display input or text for open/closed issue (#119). * Display currently logged-in user (#71). * Implement newest version of cs-content (0.10.6) * External helpdesk remembers contact_id/email * Better internal error handling & reporting * Tag modifiers affect initial issue priority * "Bug" auto-selected for new issues. * Remove "Stall" option for issues (status not properly handled anyway) * Enhanced email alerts, handle errors when sending * BBCode implemented! * Options for sending email locally vs. via SMTP (must be manually set) * AuthToken system for handling temporary authentication (lost passwords) * Helpdesk displays "Notified Users" list * Use real cookies (ones that last after browser is closed) * Javascript goodness for changing issue/project details * Updated documentation for developers & such * Use magic "__autoload()" function for class inclusions * Updates & bugfixes to upgrade system * Contacts can have multiple email address (one is always primary) * Automatic exception logging * More logging, better format of log details Modified Paths: -------------- trunk/VERSION Modified: trunk/VERSION =================================================================== --- trunk/VERSION 2007-12-19 02:01:13 UTC (rev 711) +++ trunk/VERSION 2007-12-19 18:49:52 UTC (rev 712) @@ -1,4 +1,4 @@ $Id:VERSION 628 2007-11-20 16:58:45Z crazedsanity $ -VERSION: 1.1.0-BETA16 +VERSION: 1.1.0-RC1 $HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/VERSION $ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-19 02:01:30
|
Revision: 711 http://cs-project.svn.sourceforge.net/cs-project/?rev=711&view=rev Author: crazedsanity Date: 2007-12-18 18:01:13 -0800 (Tue, 18 Dec 2007) Log Message: ----------- *** RELEASE 1.1.0-BETA16 *** SUMMARY OF CHANGES: * Formatting of helpdesk issue body & notes without "pre" tags. * More formatting of issue body & notes. * No longer wordwrap() note body in main noteClass. * Cleaning note body. * Format issue notes without the "pre" tag. * admin interface for tags * Updated tag listing. * Helpdesk converts newlines to BR's in body again (internal & external). * Ordering options for tags, ability to change modifier for tag name. * Updated block row name to match code, form to change modifier, etc (tags). * Add the "tags" section back (infobar). * Code to better display tags, option to update modifier, list alphabetically. * Folder for icons from "Sweetie-BasePack-v3" * help links * status messages show icon in title for prettiness. :) * After re-linking an issue, message now shows link back to previous project. * Force noteClass to format note data for uniform display. * Fix header (of SQL files) to have proper SVN keywords & such. * Ability to change helpdesk issue name (issue #70). * Fix order of tags when viewing issue (#123). * Fix initial priority based on tag modifier (#77). * Display ancestry link list instead of just project name on summary (#101). * Use block rows to display input or text for open/closed issue (#119). * Display currently logged-in user (#71). * Update to new version of cs-content. * More help pages & help links! SVN COMMAND: merge -r663:HEAD https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk Modified Paths: -------------- releases/1.1/VERSION releases/1.1/docs/sql/setup/00__connectSettings.sql releases/1.1/docs/sql/setup/01__storedprocs.sql releases/1.1/docs/sql/setup/02__tables.sql releases/1.1/docs/sql/setup/03__indexes_etc.sql releases/1.1/docs/sql/setup/plpgsql.sql releases/1.1/docs/sql/setup/test_plpgsql.sql releases/1.1/includes/content/helpdesk.inc releases/1.1/includes/content/project.inc releases/1.1/includes/content/summary.inc releases/1.1/includes/content/tags.inc releases/1.1/includes/content.inc releases/1.1/includes/extern/helpdesk.inc releases/1.1/lib/cs-content/VERSION releases/1.1/lib/cs-content/cs_phpDB.php releases/1.1/lib/cs-content/documentation/basics.pdf releases/1.1/lib/globalFunctions.php releases/1.1/lib/helpdeskClass.php releases/1.1/lib/noteClass.php releases/1.1/lib/tagClass.php releases/1.1/templates/content/helpdesk/view.content.tmpl releases/1.1/templates/content/project/view/related_note.content.tmpl releases/1.1/templates/content/summary/index.content.tmpl releases/1.1/templates/extern/helpdesk/view.content.tmpl releases/1.1/templates/help/index.content.tmpl releases/1.1/templates/infobar.shared.tmpl releases/1.1/templates/system/message_box.tmpl Added Paths: ----------- releases/1.1/lib/invoice.class.php releases/1.1/lib/invoiceItem.class.php releases/1.1/public_html/images/bullet-round.png releases/1.1/public_html/images/icon-help.png releases/1.1/public_html/images/icons/ releases/1.1/public_html/images/icons/12-em-check.png releases/1.1/public_html/images/icons/12-em-cross.png releases/1.1/public_html/images/icons/12-em-down.png releases/1.1/public_html/images/icons/12-em-pencil.png releases/1.1/public_html/images/icons/12-em-plus.png releases/1.1/public_html/images/icons/12-em-up.png releases/1.1/public_html/images/icons/16-arrow-down.png releases/1.1/public_html/images/icons/16-arrow-left.png releases/1.1/public_html/images/icons/16-arrow-right.png releases/1.1/public_html/images/icons/16-arrow-up.png releases/1.1/public_html/images/icons/16-circle-blue-add.png releases/1.1/public_html/images/icons/16-circle-blue-check.png releases/1.1/public_html/images/icons/16-circle-blue-delete.png releases/1.1/public_html/images/icons/16-circle-blue-remove.png releases/1.1/public_html/images/icons/16-circle-blue.png releases/1.1/public_html/images/icons/16-circle-green-add.png releases/1.1/public_html/images/icons/16-circle-green-check.png releases/1.1/public_html/images/icons/16-circle-green-delete.png releases/1.1/public_html/images/icons/16-circle-green-remove.png releases/1.1/public_html/images/icons/16-circle-green.png releases/1.1/public_html/images/icons/16-circle-red-add.png releases/1.1/public_html/images/icons/16-circle-red-check.png releases/1.1/public_html/images/icons/16-circle-red-delete.png releases/1.1/public_html/images/icons/16-circle-red-remove.png releases/1.1/public_html/images/icons/16-circle-red.png releases/1.1/public_html/images/icons/16-clock.png releases/1.1/public_html/images/icons/16-cube-blue.png releases/1.1/public_html/images/icons/16-cube-green.png releases/1.1/public_html/images/icons/16-cube-red.png releases/1.1/public_html/images/icons/16-em-check.png releases/1.1/public_html/images/icons/16-em-cross.png releases/1.1/public_html/images/icons/16-em-down.png releases/1.1/public_html/images/icons/16-em-open.png releases/1.1/public_html/images/icons/16-em-pencil.png releases/1.1/public_html/images/icons/16-em-plus.png releases/1.1/public_html/images/icons/16-file-archive.png releases/1.1/public_html/images/icons/16-file-page.png releases/1.1/public_html/images/icons/16-heart-gold-l.png releases/1.1/public_html/images/icons/16-heart-gold-m.png releases/1.1/public_html/images/icons/16-heart-gold-s.png releases/1.1/public_html/images/icons/16-heart-gold-xs.png releases/1.1/public_html/images/icons/16-heart-gold-xxs.png releases/1.1/public_html/images/icons/16-heart-red-l.png releases/1.1/public_html/images/icons/16-heart-red-m.png releases/1.1/public_html/images/icons/16-heart-red-s.png releases/1.1/public_html/images/icons/16-heart-red-xs.png releases/1.1/public_html/images/icons/16-heart-red-xxs.png releases/1.1/public_html/images/icons/16-heart-silver-l.png releases/1.1/public_html/images/icons/16-heart-silver-m.png releases/1.1/public_html/images/icons/16-heart-silver-s.png releases/1.1/public_html/images/icons/16-heart-silver-xs.png releases/1.1/public_html/images/icons/16-heart-silver-xxs.png releases/1.1/public_html/images/icons/16-image-add.png releases/1.1/public_html/images/icons/16-image-check.png releases/1.1/public_html/images/icons/16-image-remove.png releases/1.1/public_html/images/icons/16-image.png releases/1.1/public_html/images/icons/16-member-add.png releases/1.1/public_html/images/icons/16-member-heart.png releases/1.1/public_html/images/icons/16-member-profile.png releases/1.1/public_html/images/icons/16-member-remove.png releases/1.1/public_html/images/icons/16-member.png releases/1.1/public_html/images/icons/16-message-info.png releases/1.1/public_html/images/icons/16-message-warn.png releases/1.1/public_html/images/icons/16-security-key.png releases/1.1/public_html/images/icons/16-security-lock-open.png releases/1.1/public_html/images/icons/16-security-lock.png releases/1.1/public_html/images/icons/16-square-blue-add.png releases/1.1/public_html/images/icons/16-square-blue-check.png releases/1.1/public_html/images/icons/16-square-blue-delete.png releases/1.1/public_html/images/icons/16-square-blue-remove.png releases/1.1/public_html/images/icons/16-square-blue.png releases/1.1/public_html/images/icons/16-square-green-add.png releases/1.1/public_html/images/icons/16-square-green-check.png releases/1.1/public_html/images/icons/16-square-green-delete.png releases/1.1/public_html/images/icons/16-square-green-remove.png releases/1.1/public_html/images/icons/16-square-green.png releases/1.1/public_html/images/icons/16-square-red-add.png releases/1.1/public_html/images/icons/16-square-red-check.png releases/1.1/public_html/images/icons/16-square-red-delete.png releases/1.1/public_html/images/icons/16-square-red-remove.png releases/1.1/public_html/images/icons/16-square-red.png releases/1.1/public_html/images/icons/16-star-cold.png releases/1.1/public_html/images/icons/16-star-hot.png releases/1.1/public_html/images/icons/16-tag-add.png releases/1.1/public_html/images/icons/16-tag-check.png releases/1.1/public_html/images/icons/16-tag-cold.png releases/1.1/public_html/images/icons/16-tag-cross.png releases/1.1/public_html/images/icons/16-tag-hot.png releases/1.1/public_html/images/icons/16-tag-pencil.png releases/1.1/public_html/images/icons/16-tool-a.png releases/1.1/public_html/images/icons/16-tool-b.png releases/1.1/public_html/images/icons/16-tool-c.png releases/1.1/public_html/images/icons/16-tool-d.png releases/1.1/public_html/images/icons/16-zoom.png releases/1.1/public_html/images/icons/24-arrow-back.png releases/1.1/public_html/images/icons/24-arrow-first.png releases/1.1/public_html/images/icons/24-arrow-forward.png releases/1.1/public_html/images/icons/24-arrow-last.png releases/1.1/public_html/images/icons/24-arrow-next.png releases/1.1/public_html/images/icons/24-arrow-previous.png releases/1.1/public_html/images/icons/24-book-blue-add.png releases/1.1/public_html/images/icons/24-book-blue-check.png releases/1.1/public_html/images/icons/24-book-blue-mark.png releases/1.1/public_html/images/icons/24-book-blue-open.png releases/1.1/public_html/images/icons/24-book-blue-remove.png releases/1.1/public_html/images/icons/24-book-blue.png releases/1.1/public_html/images/icons/24-book-green-add.png releases/1.1/public_html/images/icons/24-book-green-check.png releases/1.1/public_html/images/icons/24-book-green-mark.png releases/1.1/public_html/images/icons/24-book-green-open.png releases/1.1/public_html/images/icons/24-book-green-remove.png releases/1.1/public_html/images/icons/24-book-green.png releases/1.1/public_html/images/icons/24-book-red-add.png releases/1.1/public_html/images/icons/24-book-red-check.png releases/1.1/public_html/images/icons/24-book-red-mark.png releases/1.1/public_html/images/icons/24-book-red-open.png releases/1.1/public_html/images/icons/24-book-red-remove.png releases/1.1/public_html/images/icons/24-book-red.png releases/1.1/public_html/images/icons/24-columns.png releases/1.1/public_html/images/icons/24-control-pause.png releases/1.1/public_html/images/icons/24-control-stop.png releases/1.1/public_html/images/icons/24-em-check.png releases/1.1/public_html/images/icons/24-em-cross.png releases/1.1/public_html/images/icons/24-em-down.png releases/1.1/public_html/images/icons/24-em-plus.png releases/1.1/public_html/images/icons/24-em-up.png releases/1.1/public_html/images/icons/24-frame-add.png releases/1.1/public_html/images/icons/24-frame-close.png releases/1.1/public_html/images/icons/24-frame-open.png releases/1.1/public_html/images/icons/24-frame.png releases/1.1/public_html/images/icons/24-heart-gold.png releases/1.1/public_html/images/icons/24-heart-red.png releases/1.1/public_html/images/icons/24-heart-silver.png releases/1.1/public_html/images/icons/24-image-add.png releases/1.1/public_html/images/icons/24-image-check.png releases/1.1/public_html/images/icons/24-image-open.png releases/1.1/public_html/images/icons/24-image-remove.png releases/1.1/public_html/images/icons/24-image.png releases/1.1/public_html/images/icons/24-imageset-add.png releases/1.1/public_html/images/icons/24-imageset-check.png releases/1.1/public_html/images/icons/24-imageset-open.png releases/1.1/public_html/images/icons/24-imageset-remove.png releases/1.1/public_html/images/icons/24-imageset.png releases/1.1/public_html/images/icons/24-member-add.png releases/1.1/public_html/images/icons/24-member-heart.png releases/1.1/public_html/images/icons/24-member-remove.png releases/1.1/public_html/images/icons/24-member.png releases/1.1/public_html/images/icons/24-message-info.png releases/1.1/public_html/images/icons/24-message-warn.png releases/1.1/public_html/images/icons/24-security-key.png releases/1.1/public_html/images/icons/24-security-lock-open.png releases/1.1/public_html/images/icons/24-security-lock.png releases/1.1/public_html/images/icons/24-settings-blue.png releases/1.1/public_html/images/icons/24-settings-orange.png releases/1.1/public_html/images/icons/24-settings-silver.png releases/1.1/public_html/images/icons/24-settings.png releases/1.1/public_html/images/icons/24-sidebar.png releases/1.1/public_html/images/icons/24-tab-add.png releases/1.1/public_html/images/icons/24-tab-close.png releases/1.1/public_html/images/icons/24-tab-open.png releases/1.1/public_html/images/icons/24-tab.png releases/1.1/public_html/images/icons/24-tag-add.png releases/1.1/public_html/images/icons/24-tag-check.png releases/1.1/public_html/images/icons/24-tag-cold.png releases/1.1/public_html/images/icons/24-tag-hot.png releases/1.1/public_html/images/icons/24-tag-manager.png releases/1.1/public_html/images/icons/24-tag-pencil.png releases/1.1/public_html/images/icons/24-tag-remove.png releases/1.1/public_html/images/icons/24-tool-a.png releases/1.1/public_html/images/icons/24-tool-b.png releases/1.1/public_html/images/icons/24-tool-c.png releases/1.1/public_html/images/icons/24-tools.png releases/1.1/public_html/images/icons/24-zoom-actual.png releases/1.1/public_html/images/icons/24-zoom-fill.png releases/1.1/public_html/images/icons/24-zoom-in.png releases/1.1/public_html/images/icons/24-zoom-out.png releases/1.1/public_html/images/icons/24-zoom.png releases/1.1/public_html/images/icons/8-em-check.png releases/1.1/public_html/images/icons/8-em-cross.png releases/1.1/public_html/images/icons/8-em-heart.png releases/1.1/public_html/images/icons/8-em-pencil.png releases/1.1/public_html/images/icons/8-em-plus.png releases/1.1/public_html/images/message_icons/ releases/1.1/public_html/images/message_icons/error.png releases/1.1/public_html/images/message_icons/fatal.png releases/1.1/public_html/images/message_icons/info.png releases/1.1/public_html/images/message_icons/notice.png releases/1.1/public_html/images/message_icons/status.png releases/1.1/templates/content/tags/index.content.tmpl releases/1.1/templates/help/helpdesk/ releases/1.1/templates/help/helpdesk/assigned.content.tmpl releases/1.1/templates/help/helpdesk/external_link.content.tmpl releases/1.1/templates/help/helpdesk/helpdesk_links.shared.tmpl releases/1.1/templates/help/helpdesk/index.content.tmpl releases/1.1/templates/help/helpdesk/notified_users.content.tmpl releases/1.1/templates/help/helpdesk/priority.content.tmpl releases/1.1/templates/help/helpdesk/project_linkage.content.tmpl releases/1.1/templates/help/helpdesk/submit_buttons.content.tmpl releases/1.1/templates/help/tags/ releases/1.1/templates/help/tags/index.content.tmpl releases/1.1/templates/help/tags/modifier.content.tmpl Removed Paths: ------------- releases/1.1/public_html/images/icons/12-em-check.png releases/1.1/public_html/images/icons/12-em-cross.png releases/1.1/public_html/images/icons/12-em-down.png releases/1.1/public_html/images/icons/12-em-pencil.png releases/1.1/public_html/images/icons/12-em-plus.png releases/1.1/public_html/images/icons/12-em-up.png releases/1.1/public_html/images/icons/16-arrow-down.png releases/1.1/public_html/images/icons/16-arrow-left.png releases/1.1/public_html/images/icons/16-arrow-right.png releases/1.1/public_html/images/icons/16-arrow-up.png releases/1.1/public_html/images/icons/16-circle-blue-add.png releases/1.1/public_html/images/icons/16-circle-blue-check.png releases/1.1/public_html/images/icons/16-circle-blue-delete.png releases/1.1/public_html/images/icons/16-circle-blue-remove.png releases/1.1/public_html/images/icons/16-circle-blue.png releases/1.1/public_html/images/icons/16-circle-green-add.png releases/1.1/public_html/images/icons/16-circle-green-check.png releases/1.1/public_html/images/icons/16-circle-green-delete.png releases/1.1/public_html/images/icons/16-circle-green-remove.png releases/1.1/public_html/images/icons/16-circle-green.png releases/1.1/public_html/images/icons/16-circle-red-add.png releases/1.1/public_html/images/icons/16-circle-red-check.png releases/1.1/public_html/images/icons/16-circle-red-delete.png releases/1.1/public_html/images/icons/16-circle-red-remove.png releases/1.1/public_html/images/icons/16-circle-red.png releases/1.1/public_html/images/icons/16-clock.png releases/1.1/public_html/images/icons/16-cube-blue.png releases/1.1/public_html/images/icons/16-cube-green.png releases/1.1/public_html/images/icons/16-cube-red.png releases/1.1/public_html/images/icons/16-em-check.png releases/1.1/public_html/images/icons/16-em-cross.png releases/1.1/public_html/images/icons/16-em-down.png releases/1.1/public_html/images/icons/16-em-open.png releases/1.1/public_html/images/icons/16-em-pencil.png releases/1.1/public_html/images/icons/16-em-plus.png releases/1.1/public_html/images/icons/16-file-archive.png releases/1.1/public_html/images/icons/16-file-page.png releases/1.1/public_html/images/icons/16-heart-gold-l.png releases/1.1/public_html/images/icons/16-heart-gold-m.png releases/1.1/public_html/images/icons/16-heart-gold-s.png releases/1.1/public_html/images/icons/16-heart-gold-xs.png releases/1.1/public_html/images/icons/16-heart-gold-xxs.png releases/1.1/public_html/images/icons/16-heart-red-l.png releases/1.1/public_html/images/icons/16-heart-red-m.png releases/1.1/public_html/images/icons/16-heart-red-s.png releases/1.1/public_html/images/icons/16-heart-red-xs.png releases/1.1/public_html/images/icons/16-heart-red-xxs.png releases/1.1/public_html/images/icons/16-heart-silver-l.png releases/1.1/public_html/images/icons/16-heart-silver-m.png releases/1.1/public_html/images/icons/16-heart-silver-s.png releases/1.1/public_html/images/icons/16-heart-silver-xs.png releases/1.1/public_html/images/icons/16-heart-silver-xxs.png releases/1.1/public_html/images/icons/16-image-add.png releases/1.1/public_html/images/icons/16-image-check.png releases/1.1/public_html/images/icons/16-image-remove.png releases/1.1/public_html/images/icons/16-image.png releases/1.1/public_html/images/icons/16-member-add.png releases/1.1/public_html/images/icons/16-member-heart.png releases/1.1/public_html/images/icons/16-member-profile.png releases/1.1/public_html/images/icons/16-member-remove.png releases/1.1/public_html/images/icons/16-member.png releases/1.1/public_html/images/icons/16-message-info.png releases/1.1/public_html/images/icons/16-message-warn.png releases/1.1/public_html/images/icons/16-security-key.png releases/1.1/public_html/images/icons/16-security-lock-open.png releases/1.1/public_html/images/icons/16-security-lock.png releases/1.1/public_html/images/icons/16-square-blue-add.png releases/1.1/public_html/images/icons/16-square-blue-check.png releases/1.1/public_html/images/icons/16-square-blue-delete.png releases/1.1/public_html/images/icons/16-square-blue-remove.png releases/1.1/public_html/images/icons/16-square-blue.png releases/1.1/public_html/images/icons/16-square-green-add.png releases/1.1/public_html/images/icons/16-square-green-check.png releases/1.1/public_html/images/icons/16-square-green-delete.png releases/1.1/public_html/images/icons/16-square-green-remove.png releases/1.1/public_html/images/icons/16-square-green.png releases/1.1/public_html/images/icons/16-square-red-add.png releases/1.1/public_html/images/icons/16-square-red-check.png releases/1.1/public_html/images/icons/16-square-red-delete.png releases/1.1/public_html/images/icons/16-square-red-remove.png releases/1.1/public_html/images/icons/16-square-red.png releases/1.1/public_html/images/icons/16-star-cold.png releases/1.1/public_html/images/icons/16-star-hot.png releases/1.1/public_html/images/icons/16-tag-add.png releases/1.1/public_html/images/icons/16-tag-check.png releases/1.1/public_html/images/icons/16-tag-cold.png releases/1.1/public_html/images/icons/16-tag-cross.png releases/1.1/public_html/images/icons/16-tag-hot.png releases/1.1/public_html/images/icons/16-tag-pencil.png releases/1.1/public_html/images/icons/16-tool-a.png releases/1.1/public_html/images/icons/16-tool-b.png releases/1.1/public_html/images/icons/16-tool-c.png releases/1.1/public_html/images/icons/16-tool-d.png releases/1.1/public_html/images/icons/16-zoom.png releases/1.1/public_html/images/icons/24-arrow-back.png releases/1.1/public_html/images/icons/24-arrow-first.png releases/1.1/public_html/images/icons/24-arrow-forward.png releases/1.1/public_html/images/icons/24-arrow-last.png releases/1.1/public_html/images/icons/24-arrow-next.png releases/1.1/public_html/images/icons/24-arrow-previous.png releases/1.1/public_html/images/icons/24-book-blue-add.png releases/1.1/public_html/images/icons/24-book-blue-check.png releases/1.1/public_html/images/icons/24-book-blue-mark.png releases/1.1/public_html/images/icons/24-book-blue-open.png releases/1.1/public_html/images/icons/24-book-blue-remove.png releases/1.1/public_html/images/icons/24-book-blue.png releases/1.1/public_html/images/icons/24-book-green-add.png releases/1.1/public_html/images/icons/24-book-green-check.png releases/1.1/public_html/images/icons/24-book-green-mark.png releases/1.1/public_html/images/icons/24-book-green-open.png releases/1.1/public_html/images/icons/24-book-green-remove.png releases/1.1/public_html/images/icons/24-book-green.png releases/1.1/public_html/images/icons/24-book-red-add.png releases/1.1/public_html/images/icons/24-book-red-check.png releases/1.1/public_html/images/icons/24-book-red-mark.png releases/1.1/public_html/images/icons/24-book-red-open.png releases/1.1/public_html/images/icons/24-book-red-remove.png releases/1.1/public_html/images/icons/24-book-red.png releases/1.1/public_html/images/icons/24-columns.png releases/1.1/public_html/images/icons/24-control-pause.png releases/1.1/public_html/images/icons/24-control-stop.png releases/1.1/public_html/images/icons/24-em-check.png releases/1.1/public_html/images/icons/24-em-cross.png releases/1.1/public_html/images/icons/24-em-down.png releases/1.1/public_html/images/icons/24-em-plus.png releases/1.1/public_html/images/icons/24-em-up.png releases/1.1/public_html/images/icons/24-frame-add.png releases/1.1/public_html/images/icons/24-frame-close.png releases/1.1/public_html/images/icons/24-frame-open.png releases/1.1/public_html/images/icons/24-frame.png releases/1.1/public_html/images/icons/24-heart-gold.png releases/1.1/public_html/images/icons/24-heart-red.png releases/1.1/public_html/images/icons/24-heart-silver.png releases/1.1/public_html/images/icons/24-image-add.png releases/1.1/public_html/images/icons/24-image-check.png releases/1.1/public_html/images/icons/24-image-open.png releases/1.1/public_html/images/icons/24-image-remove.png releases/1.1/public_html/images/icons/24-image.png releases/1.1/public_html/images/icons/24-imageset-add.png releases/1.1/public_html/images/icons/24-imageset-check.png releases/1.1/public_html/images/icons/24-imageset-open.png releases/1.1/public_html/images/icons/24-imageset-remove.png releases/1.1/public_html/images/icons/24-imageset.png releases/1.1/public_html/images/icons/24-member-add.png releases/1.1/public_html/images/icons/24-member-heart.png releases/1.1/public_html/images/icons/24-member-remove.png releases/1.1/public_html/images/icons/24-member.png releases/1.1/public_html/images/icons/24-message-info.png releases/1.1/public_html/images/icons/24-message-warn.png releases/1.1/public_html/images/icons/24-security-key.png releases/1.1/public_html/images/icons/24-security-lock-open.png releases/1.1/public_html/images/icons/24-security-lock.png releases/1.1/public_html/images/icons/24-settings-blue.png releases/1.1/public_html/images/icons/24-settings-orange.png releases/1.1/public_html/images/icons/24-settings-silver.png releases/1.1/public_html/images/icons/24-settings.png releases/1.1/public_html/images/icons/24-sidebar.png releases/1.1/public_html/images/icons/24-tab-add.png releases/1.1/public_html/images/icons/24-tab-close.png releases/1.1/public_html/images/icons/24-tab-open.png releases/1.1/public_html/images/icons/24-tab.png releases/1.1/public_html/images/icons/24-tag-add.png releases/1.1/public_html/images/icons/24-tag-check.png releases/1.1/public_html/images/icons/24-tag-cold.png releases/1.1/public_html/images/icons/24-tag-hot.png releases/1.1/public_html/images/icons/24-tag-manager.png releases/1.1/public_html/images/icons/24-tag-pencil.png releases/1.1/public_html/images/icons/24-tag-remove.png releases/1.1/public_html/images/icons/24-tool-a.png releases/1.1/public_html/images/icons/24-tool-b.png releases/1.1/public_html/images/icons/24-tool-c.png releases/1.1/public_html/images/icons/24-tools.png releases/1.1/public_html/images/icons/24-zoom-actual.png releases/1.1/public_html/images/icons/24-zoom-fill.png releases/1.1/public_html/images/icons/24-zoom-in.png releases/1.1/public_html/images/icons/24-zoom-out.png releases/1.1/public_html/images/icons/24-zoom.png releases/1.1/public_html/images/icons/8-em-check.png releases/1.1/public_html/images/icons/8-em-cross.png releases/1.1/public_html/images/icons/8-em-heart.png releases/1.1/public_html/images/icons/8-em-pencil.png releases/1.1/public_html/images/icons/8-em-plus.png releases/1.1/public_html/images/message_icons/error.png releases/1.1/public_html/images/message_icons/fatal.png releases/1.1/public_html/images/message_icons/info.png releases/1.1/public_html/images/message_icons/notice.png releases/1.1/public_html/images/message_icons/status.png releases/1.1/templates/content/tags/shared.content.tmpl releases/1.1/templates/help/helpdesk/assigned.content.tmpl releases/1.1/templates/help/helpdesk/external_link.content.tmpl releases/1.1/templates/help/helpdesk/helpdesk_links.shared.tmpl releases/1.1/templates/help/helpdesk/index.content.tmpl releases/1.1/templates/help/helpdesk/notified_users.content.tmpl releases/1.1/templates/help/helpdesk/priority.content.tmpl releases/1.1/templates/help/helpdesk/project_linkage.content.tmpl releases/1.1/templates/help/helpdesk/submit_buttons.content.tmpl releases/1.1/templates/help/tags/index.content.tmpl releases/1.1/templates/help/tags/modifier.content.tmpl Modified: releases/1.1/VERSION =================================================================== --- releases/1.1/VERSION 2007-12-19 01:41:33 UTC (rev 710) +++ releases/1.1/VERSION 2007-12-19 02:01:13 UTC (rev 711) @@ -1,4 +1,4 @@ $Id:VERSION 628 2007-11-20 16:58:45Z crazedsanity $ -VERSION: 1.1.0-BETA15 +VERSION: 1.1.0-BETA16 $HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/VERSION $ Modified: releases/1.1/docs/sql/setup/00__connectSettings.sql =================================================================== --- releases/1.1/docs/sql/setup/00__connectSettings.sql 2007-12-19 01:41:33 UTC (rev 710) +++ releases/1.1/docs/sql/setup/00__connectSettings.sql 2007-12-19 02:01:13 UTC (rev 711) @@ -1,6 +1,6 @@ -- -- SVN INFORMATION::: --- SVN Signature: $Id:::: 00__connectSettings.sql 185 2007-09-15 23:42:34Z crazedsanity $ +-- SVN Signature::::::::: $Id$ -- Last Committted Date:: $Date$ -- Last Committed Path::: $HeadURL$ -- Modified: releases/1.1/docs/sql/setup/01__storedprocs.sql =================================================================== --- releases/1.1/docs/sql/setup/01__storedprocs.sql 2007-12-19 01:41:33 UTC (rev 710) +++ releases/1.1/docs/sql/setup/01__storedprocs.sql 2007-12-19 02:01:13 UTC (rev 711) @@ -1,6 +1,6 @@ -- -- SVN INFORMATION::: --- SVN Signature: $Id:::: 01__storedprocs.sql 186 2007-09-15 23:43:10Z crazedsanity $ +-- SVN Signature::::::::: $Id$ -- Last Committted Date:: $Date$ -- Last Committed Path::: $HeadURL$ -- Modified: releases/1.1/docs/sql/setup/02__tables.sql =================================================================== --- releases/1.1/docs/sql/setup/02__tables.sql 2007-12-19 01:41:33 UTC (rev 710) +++ releases/1.1/docs/sql/setup/02__tables.sql 2007-12-19 02:01:13 UTC (rev 711) @@ -1,6 +1,6 @@ -- -- SVN INFORMATION::: --- SVN Signature: $Id:::: 02__tables.sql 253 2007-09-29 19:48:37Z crazedsanity $ +-- SVN Signature::::::::: $Id$ -- Last Committted Date:: $Date$ -- Last Committed Path::: $HeadURL$ -- Modified: releases/1.1/docs/sql/setup/03__indexes_etc.sql =================================================================== --- releases/1.1/docs/sql/setup/03__indexes_etc.sql 2007-12-19 01:41:33 UTC (rev 710) +++ releases/1.1/docs/sql/setup/03__indexes_etc.sql 2007-12-19 02:01:13 UTC (rev 711) @@ -1,8 +1,8 @@ -- -- SVN INFORMATION::: --- SVN Signature: $Id:::: 03__indexes_etc.sql 253 2007-09-29 19:48:37Z crazedsanity $ --- Last Committted Date:: $Date:2007-11-20 11:02:38 -0600 (Tue, 20 Nov 2007) $ --- Last Committed Path::: $HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/docs/sql/setup/03__indexes_etc.sql $ +-- SVN Signature: $Id:::: 01__storedprocs.sql 186 2007-09-15 23:43:10Z crazedsanity $ +-- Last Committted Date:: $Date$ +-- Last Committed Path::: $HeadURL$ -- -- Modified: releases/1.1/docs/sql/setup/plpgsql.sql =================================================================== --- releases/1.1/docs/sql/setup/plpgsql.sql 2007-12-19 01:41:33 UTC (rev 710) +++ releases/1.1/docs/sql/setup/plpgsql.sql 2007-12-19 02:01:13 UTC (rev 711) @@ -1,7 +1,7 @@ -- -- SVN INFORMATION::: --- SVN Signature: $Id:::: plpgsql.sql 183 2007-09-14 23:17:47Z crazedsanity $ --- Last Committted Date:: $Date$ +-- SVN Signature: $Id:::: 03__indexes_etc.sql 253 2007-09-29 19:48:37Z crazedsanity $ +-- Last Committted Date:: $Date:2007-11-20 11:02:38 -0600 (Tue, 20 Nov 2007) $ -- Last Committed Path::: $HeadURL$ -- Modified: releases/1.1/docs/sql/setup/test_plpgsql.sql =================================================================== --- releases/1.1/docs/sql/setup/test_plpgsql.sql 2007-12-19 01:41:33 UTC (rev 710) +++ releases/1.1/docs/sql/setup/test_plpgsql.sql 2007-12-19 02:01:13 UTC (rev 711) @@ -1,7 +1,7 @@ -- -- SVN INFORMATION::: --- SVN Signature::::::::: $Id$ --- Last Committted Date:: $Date$ +-- SVN Signature: $Id:::: 03__indexes_etc.sql 253 2007-09-29 19:48:37Z crazedsanity $ +-- Last Committted Date:: $Date:2007-11-20 11:02:38 -0600 (Tue, 20 Nov 2007) $ -- Last Committed Path::: $HeadURL$ -- Modified: releases/1.1/includes/content/helpdesk.inc =================================================================== --- releases/1.1/includes/content/helpdesk.inc 2007-12-19 01:41:33 UTC (rev 710) +++ releases/1.1/includes/content/helpdesk.inc 2007-12-19 02:01:13 UTC (rev 711) @@ -23,13 +23,29 @@ $_POST['updates']['parentRecordId'] = $_POST['updates']['project_id']; unset($_POST['updates']['project_id']); - //that means we've gotta update everything sent... right? + + //if they've changed the name, we gotta log it. + //TODO: probably log this within helpdeskClass::update(). + if(isset($_POST['updates']['name'])) { + //retrieve the old info. + $oldData = $proj->helpdeskObj->get_record($_POST['id']); + + if($oldData['name'] !== $_POST['updates']['name']) { + $addRemark = 'Updated [b]name[/b] from ([b][i]'. $oldData['name'] .'[/i][/b])'; + } + } + $doNotAcceptFields = array("solution", "remark"); foreach($doNotAcceptFields as $unsetThis) { unset($_POST['updates'][$unsetThis]); } $result = $proj->helpdeskObj->update_record($helpdeskId, $_POST['updates']); + if(strlen($addRemark)) { + $proj->helpdeskObj->remark($_POST['id'], $addRemark); + } + + //tell them what happened. if($result == 1) { set_message_wrapper(array( @@ -205,7 +221,7 @@ $page->set_all_block_rows("content"); //show the "category" selection. - $categoryList = $proj->helpdeskObj->get_category_list('bug'); + $categoryList = $proj->helpdeskObj->get_category_list('bug', TRUE); $page->add_template_var("select_tags", $categoryList); // @@ -247,21 +263,29 @@ $page->add_template_var("select_category_list", $categoryList); //convert the returned data into htmlentities so brackets show properly. - $helpdeskData['subject'] = $bbCodeParser->parseString(cleanString($helpdeskData['subject'], "htmlentity_plus_brackets")); + $helpdeskData['subject'] = $bbCodeParser->parseString(cleanString($helpdeskData['subject'], "htmlentity_plus_brackets"), TRUE); + $helpdeskData['subject'] = preg_replace('/\s\s/', ' ', $helpdeskData['subject']); + $helpdeskData['subject'] = preg_replace('/\S\s\s/', ' ', $helpdeskData['subject']); + + $helpdeskData['name'] = cleanString($helpdeskData['name'], "htmlentity_plus_brackets"); $helpdeskData['solution'] = cleanString($helpdeskData['solution'], "htmlentity_plus_brackets"); //make the wrapping SANE. - $helpdeskData['subject'] = wordwrap($helpdeskData['subject'], FORMAT_WORDWRAP); + #$helpdeskData['subject'] = wordwrap($helpdeskData['subject'], FORMAT_WORDWRAP); //show the buttons appropriate to their membership level & ownership. //if they're the owner, show the "solution" section. $assignedStr = $helpdeskData['leader_contact_id']; if($helpdeskData['status_id'] == 4) { //allow the current user to re-open this issue. + $doNotRipRows[] = "assigned_text"; + $doNotRipRows[] = "priority_text"; $doNotRipRows[] = "reopen_button"; } else { + $doNotRipRows[] = "assigned_optionList"; + $doNotRipRows[] = "priority_optionList"; if(($assignedStr == $_SESSION['contact_id']) || ($assignedStr == "" || is_null($assignedStr))) { //well, we can show 'em the update/modify button. $doNotRipRows[] = "update_button"; @@ -365,8 +389,10 @@ if(is_array($myNotes) && count($myNotes)) { $baseRow = $page->templateRows['issueNotes']; foreach($myNotes as $repArr) { - $repArr['body'] = $bbCodeParser->parseString(cleanString($repArr['body'], "htmlentity_plus_brackets")); + $repArr['body'] = $bbCodeParser->parseString($repArr['body']); + $repArr['subject'] = cleanString($repArr['subject'], "htmlentity_plus_brackets"); + $repArr['solutionIndicator'] = ""; if($repArr['is_solution'] == 't') { Modified: releases/1.1/includes/content/project.inc =================================================================== --- releases/1.1/includes/content/project.inc 2007-12-19 01:41:33 UTC (rev 710) +++ releases/1.1/includes/content/project.inc 2007-12-19 02:01:13 UTC (rev 711) @@ -183,9 +183,16 @@ $helpdeskObj->remark($linkIssue, $remarkDetails); if($linkRes) { + $oldIsHelpdesk = $proj->helpdeskObj->isHelpdeskIssue; + $proj->helpdeskObj->isHelpdeskIssue=FALSE; + $oldProjData = $proj->helpdeskObj->get_parent_record($issueData['ancestry']); + $proj->helpdeskObj->isHelpdeskIssue=$oldIsHelpdesk; + $oldProjLinkList = $proj->get_ancestry_link_list($oldProjData['public_id'], TRUE, TRUE, TRUE); + $page->set_message_wrapper(array( 'title' => "Issue Linked Successfully", - 'message' => "Issue #". $linkIssue ." was successfully linked to this project.", + 'message' => "Issue #". $linkIssue ." was successfully linked to this project.<BR><BR>" . + "<b>Back to old project:</b> [". $oldProjLinkList ."]", 'type' => "status" )); } Modified: releases/1.1/includes/content/summary.inc =================================================================== --- releases/1.1/includes/content/summary.inc 2007-12-19 01:41:33 UTC (rev 710) +++ releases/1.1/includes/content/summary.inc 2007-12-19 02:01:13 UTC (rev 711) @@ -130,7 +130,6 @@ function process_row(&$page, $projectArr, $expandArr, $baseRow, $level=0) { //loop through the array... $linkLevel = $level+1; - //pre-pad subprojects, so they appear indented. if($level > 0) { @@ -140,7 +139,16 @@ } } if(is_array($projectArr)) { + + $projObj = new projectClass($page->db); + foreach($projectArr as $id=>$subArr) { + + $subArr['linkList'] = $projObj->get_ancestry_link_list($id); + if(!strlen($subArr['linkList'])) { + $subArr['linkList'] = $subArr['name']; + } + //parse stuff into the template row... $rowColor1 = swapValue($rowColor1, "rgb(213, 213, 213)", "rgb(194, 194, 194)"); $rowColor2 = swapValue($rowColor2,"#D5D5D5", "#C2C2C2"); Modified: releases/1.1/includes/content/tags.inc =================================================================== --- releases/1.1/includes/content/tags.inc 2007-12-19 01:41:33 UTC (rev 710) +++ releases/1.1/includes/content/tags.inc 2007-12-19 02:01:13 UTC (rev 711) @@ -106,7 +106,10 @@ debug_print($_POST); $goHere = $_SERVER['PHP_SELF']; - if($_POST['new_tag']) { + if($_POST['action'] == 'update') { + $result = $proj->tagObj->update_tag_modifier($_POST['tag_name_id'], $_POST['modifier']); + } + elseif($_POST['new_tag']) { //check for pre-existing tags of that name. $myTagList = $proj->tagObj->get_tag_list(); $existingTagNameId = array_search($_POST['new_tag'], $myTagList); @@ -158,10 +161,10 @@ } //get the list of tags, regardless of whether we'll show 'em all or not. -$myTagList = $proj->tagObj->get_tag_list(); +$myTagList = $proj->tagObj->get_tag_list(TRUE, FALSE); $showData = TRUE; -$showTagNameId = $sessionCache->get_cache('tagNameId'); +#$showTagNameId = $sessionCache->get_cache('tagNameId'); if($_GET['move']) { @@ -205,7 +208,7 @@ $messageArr = array( 'title' => 'No Tag Specified', 'message' => "For your convenience, records for the first available tag, " . - "\"". $myTagList[$showTagNameId] ."\" ($showTagNameId) are currently displayed. " . + "\"". $myTagList[$showTagNameId]['name'] ."\" ($showTagNameId) are currently displayed. " . "You may select a different tag from the list.", 'type' => 'notice' ); @@ -241,15 +244,20 @@ //retrieve the (possibly updated) setting $showTagNameId = $sessionCache->get_cache('tagNameId'); -if($showData) { +if($showData) { //get data for this tag. $data = $proj->tagObj->get_records_for_tag($showTagNameId); //set some vars. - $page->add_template_var("tagName", $myTagList[$showTagNameId]); + $page->add_template_var("tagName", $myTagList[$showTagNameId]['name']); + $page->add_template_var('tagModifier', $myTagList[$showTagNameId]['modifier']); $page->add_template_var("tagRecordCount", count($data)); $page->add_template_var("showTagNameId", $showTagNameId); + $page->add_template_var('modifier_option_list', create_priority_option_list($myTagList[$showTagNameId]['modifier'], 5, -5)); + + create_page_title($page, array('title' => "Tag #". $showTagNameId . ": ". $myTagList[$showTagNameId]['name'])); + //rip all block rows. $page->set_all_block_rows('content'); @@ -273,7 +281,8 @@ //display the list of available tags. $tagListBaseRow = $page->templateRows['availableTagsList']; $myRow = ""; - foreach($myTagList as $tagNameId=>$tagName) { + foreach($myTagList as $tagNameId=>$data) { + $tagName = $data['name']; $tagListBaseRow = $page->templateRows['availableTagsList']; if($tagNameId == $showTagNameId) { //switch to a row without the link, so it's more apparent what's selected. Modified: releases/1.1/includes/content.inc =================================================================== --- releases/1.1/includes/content.inc 2007-12-19 01:41:33 UTC (rev 710) +++ releases/1.1/includes/content.inc 2007-12-19 02:01:13 UTC (rev 711) @@ -39,6 +39,17 @@ $user = new userClass($page->db, $_SESSION['uid']); +if(is_numeric($_SESSION['login_contact_id'])) { + $contactObj = new contactClass($page->db); + $contactObj->set_contact_id($_SESSION['login_contact_id']); + $contactData = $contactObj->get_contact(); + + $page->add_template_var('LOGGED_USERNAME', $_SESSION['login_username']); + $page->add_template_var('LOGGED_CONTACT_ID', $_SESSION['login_contact_id']); + $page->add_template_var('LOGGED_CONTACT_NAME', $contactData['fname'] .' '. $contactData['lname']); + $page->add_template_var('LOGGED_COMPANY', $contactData['company']); +} + if(!$page->ui->get_cache("userData/settings")) { $page->ui->set_cache("userData/settings", $user->get_settings()); } @@ -116,6 +127,7 @@ 'summary' => "Summary", 'project' => "Projects", 'helpdesk' => "Helpdesk", + 'tags' => "Tags", 'contacts' => "Contacts", 'settings' => "Settings", ); Modified: releases/1.1/includes/extern/helpdesk.inc =================================================================== --- releases/1.1/includes/extern/helpdesk.inc 2007-12-19 01:41:33 UTC (rev 710) +++ releases/1.1/includes/extern/helpdesk.inc 2007-12-19 02:01:13 UTC (rev 711) @@ -146,8 +146,10 @@ unset($helpdeskData['notes']); //make the wrapping SANE. - $helpdeskData['subject'] = wordwrap($helpdeskData['subject'], FORMAT_WORDWRAP); - $helpdeskData['subject'] = $bbCodeParser->parseString($helpdeskData['subject'],FALSE); + #$helpdeskData['subject'] = wordwrap($helpdeskData['subject'], FORMAT_WORDWRAP); + $helpdeskData['subject'] = cleanString($helpdeskData['subject'], "htmlentity_plus_brackets"); + $helpdeskData['subject'] = $bbCodeParser->parseString($helpdeskData['subject'], TRUE); + $helpdeskData['subject'] = preg_replace('/\S\s\s/', ' ', $helpdeskData['subject']); //add everything to the page as a template var... foreach($helpdeskData as $field=>$value) { @@ -176,8 +178,10 @@ if(is_array($myNotes) && count($myNotes)) { $baseRow = $page->templateRows['issueNotes']; foreach($myNotes as $repArr) { - $repArr['body'] = cleanString($repArr['body'], "htmlentity_plus_brackets"); $repArr['body'] = $bbCodeParser->parseString($repArr['body'], FALSE); + $repArr['body'] = preg_replace('/\s\s/', ' ', $repArr['body']); + $repArr['body'] = preg_replace('/\S\s\s/', ' ', $repArr['body']); + $repArr['subject'] = cleanString($repArr['subject'], "htmlentity_plus_brackets"); $repArr['solutionIndicator'] = ""; Modified: releases/1.1/lib/cs-content/VERSION =================================================================== --- releases/1.1/lib/cs-content/VERSION 2007-12-19 01:41:33 UTC (rev 710) +++ releases/1.1/lib/cs-content/VERSION 2007-12-19 02:01:13 UTC (rev 711) @@ -1,5 +1,5 @@ ## Stores the current version of the cs-content system, and it's source. Please do NOT modify this file. -VERSION: 0.10.5 +VERSION: 0.10.6 PROJECT: cs-content $HeadURL:https://cs-content.svn.sourceforge.net/svnroot/cs-content/trunk/VERSION $ \ No newline at end of file Modified: releases/1.1/lib/cs-content/cs_phpDB.php =================================================================== --- releases/1.1/lib/cs-content/cs_phpDB.php 2007-12-19 01:41:33 UTC (rev 710) +++ releases/1.1/lib/cs-content/cs_phpDB.php 2007-12-19 02:01:13 UTC (rev 711) @@ -4,8 +4,8 @@ * A class for generic PostgreSQL database access. * * SVN INFORMATION::: - * SVN Signature:::::::: $Id: cs_phpDB.php 221 2007-11-21 17:39:01Z crazedsanity $ - * Last Committted Date: $Date: 2007-11-21 11:39:01 -0600 (Wed, 21 Nov 2007) $ + * SVN Signature:::::::: $Id: cs_phpDB.php 225 2007-12-19 00:20:13Z crazedsanity $ + * Last Committted Date: $Date: 2007-12-18 18:20:13 -0600 (Tue, 18 Dec 2007) $ * Last Committed Path:: $HeadURL: https://cs-content.svn.sourceforge.net/svnroot/cs-content/releases/0.10/cs_phpDB.php $ * */ @@ -105,6 +105,10 @@ public function __construct() { $this->gfObj = new cs_globalFunctions; + if(defined('DEBUGPRINTOPT')) { + $this->gfObj->debugPrintOpt = DEBUGPRINTOPT; + } + $this->isInitialized = TRUE; }//end __construct() //========================================================================= Modified: releases/1.1/lib/cs-content/documentation/basics.pdf =================================================================== (Binary files differ) Modified: releases/1.1/lib/globalFunctions.php =================================================================== --- releases/1.1/lib/globalFunctions.php 2007-12-19 01:41:33 UTC (rev 710) +++ releases/1.1/lib/globalFunctions.php 2007-12-19 02:01:13 UTC (rev 711) @@ -17,7 +17,7 @@ function get_required_external_lib_versions($projectName=NULL) { //format: {className} => array({projectName} => {exactVersion}) $requirements = array( - 'contentSystem' => array('cs-content', '0.10.5'), + 'contentSystem' => array('cs-content', '0.10.6'), 'XMLParser' => array('cs-phpxml', '0.5.5'), 'arrayToPath' => array('cs-arrayToPath', '0.2.2') ); Modified: releases/1.1/lib/helpdeskClass.php =================================================================== --- releases/1.1/lib/helpdeskClass.php 2007-12-19 01:41:33 UTC (rev 710) +++ releases/1.1/lib/helpdeskClass.php 2007-12-19 02:01:13 UTC (rev 711) @@ -297,7 +297,7 @@ if(is_array($dataArr['initialTag']) && count($dataArr['initialTag'])) { //get the list of tags, so we know what the total modifier is. - $allTags = $tagObj->get_tag_list(); + $allTags = $tagObj->get_tag_list(TRUE); foreach($dataArr['initialTag'] as $id) { $dataArr['priority'] += $allTags[$id]['modifier']; @@ -410,10 +410,10 @@ /** * This returns a list of available TAGS (the "helpdesk_cat" table is deprecated) */ - function get_category_list($selectThis=NULL) { + function get_category_list($selectThis=NULL, $orderByMod=FALSE) { //create a list of tags. $object = new tagClass($this->db); - $mainTagList = $object->get_tag_list(TRUE); + $mainTagList = $object->get_tag_list(TRUE, $orderByMod); //create the "replacement array" and such. $tagList = array(); Copied: releases/1.1/lib/invoice.class.php (from rev 710, trunk/lib/invoice.class.php) =================================================================== --- releases/1.1/lib/invoice.class.php (rev 0) +++ releases/1.1/lib/invoice.class.php 2007-12-19 02:01:13 UTC (rev 711) @@ -0,0 +1,37 @@ +<?php +/* + * + * SVN INFORMATION::: + * ------------------ + * SVN Signature::::::: $Id$ + * Last Author::::::::: $Author$ + * Current Revision:::: $Revision$ + * Repository Location: $HeadURL$ + * Last Updated:::::::: $Date$ + * + */ + +//TODO: log everything! + +class invoice extends dbAbstract { + + protected $gfObj; + protected $logsObj; + + //========================================================================= + public function __construct(cs_phpDB $db) { + $this->db = $db; + $this->gfObj = new cs_globalFunctions; + $this->gfObj->debugPrintOpt = DEBUGPRINTOPT; + $this->logsObj = new logsClass($this->db, 'Authentication Token'); + }//end __construct() + //========================================================================= + + + + //========================================================================= + public function add_item(invoiceItem $item) { + }//end add_item() + //========================================================================= +} +?> Property changes on: releases/1.1/lib/invoice.class.php ___________________________________________________________________ Name: svn:keywords + Id HeadURL Date Revision Author Name: svn:eol-style + native Copied: releases/1.1/lib/invoiceItem.class.php (from rev 710, trunk/lib/invoiceItem.class.php) =================================================================== --- releases/1.1/lib/invoiceItem.class.php (rev 0) +++ releases/1.1/lib/invoiceItem.class.php 2007-12-19 02:01:13 UTC (rev 711) @@ -0,0 +1,38 @@ +<?php +/* + * + * SVN INFORMATION::: + * ------------------ + * SVN Signature::::::: $Id$ + * Last Author::::::::: $Author$ + * Current Revision:::: $Revision$ + * Repository Location: $HeadURL$ + * Last Updated:::::::: $Date$ + * + * TODO: test methods to make sure they work! + */ + +//TODO: log everything! + +class invoiceItem extends dbAbstract { + + protected $gfObj; + protected $logsObj; + + //========================================================================= + public function __construct(cs_phpDB $db) { + $this->db = $db; + $this->gfObj = new cs_globalFunctions; + $this->gfObj->debugPrintOpt = DEBUGPRINTOPT; + $this->logsObj = new logsClass($this->db, 'Authentication Token'); + }//end __construct() + //========================================================================= + + + + //========================================================================= + public function create_item(array $data) { + }//end create_item() + //========================================================================= +} +?> Property changes on: releases/1.1/lib/invoiceItem.class.php ___________________________________________________________________ Name: svn:keywords + Id HeadURL Date Revision Author Name: svn:eol-style + native Modified: releases/1.1/lib/noteClass.php =================================================================== --- releases/1.1/lib/noteClass.php 2007-12-19 01:41:33 UTC (rev 710) +++ releases/1.1/lib/noteClass.php 2007-12-19 02:01:13 UTC (rev 711) @@ -2,11 +2,11 @@ /* * SVN INFORMATION::: * ------------------ - * SVN Signature::::::: $Id$ - * Last Author::::::::: $Author$ - * Current Revision:::: $Revision$ - * Repository Location: $HeadURL$ - * Last Updated:::::::: $Date$ + * SVN Signature::::::: $Id:noteClass.php 626 2007-11-20 16:54:11Z crazedsanity $ + * Last Author::::::::: $Author:crazedsanity $ + * Current Revision:::: $Revision:626 $ + * Repository Location: $HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/lib/noteClass.php $ + * Last Updated:::::::: $Date:2007-11-20 10:54:11 -0600 (Tue, 20 Nov 2007) $ */ @@ -52,7 +52,7 @@ * @return 0 FAIL: unable to retrieve notes. * @return <array> PASS: array contains records, indexed by id. */ - function get_notes($critArr=NULL, $primaryOrder=NULL) { + function get_notes($critArr=NULL, $primaryOrder=NULL, $formatIt=TRUE) { if(is_array($primaryOrder)) { $arrayKeysArr = array_keys($primaryOrder); @@ -102,11 +102,20 @@ $retval = $this->db->farray_fieldnames("note_id",NULL,0); foreach($retval as $id=>$arr) { - //add some wrapping & cleaning (so the data appears properly) - $retval[$id]['body'] = wordwrap($arr['body'], 95); - $retval[$id]['subject'] = cleanString($retval[$id]['subject'], "htmlentity_plus_brackets"); - $retval[$id]['body'] = cleanString($retval[$id]['body'], "htmlentity_plus_brackets"); + if($formatIt === TRUE) { + //add some wrapping & cleaning (so the data appears properly) + $retval[$id]['subject'] = cleanString($retval[$id]['subject'], "htmlentity_plus_brackets"); + + $body = $retval[$id]['body']; + $body = cleanString($body, "htmlentity_plus_brackets"); + $body = preg_replace("/\n/", "<BR>", $body); + $body = preg_replace('/\s\s/', ' ', $body); + $body = preg_replace('/\S\s\s/', ' ', $body); + + $retval[$id]['body'] = $body; + } + //make the created & updated fields nicer. $cleanDatesArr = array('created', 'updated'); foreach($cleanDatesArr as $dateField) { Modified: releases/1.1/lib/tagClass.php =================================================================== --- releases/1.1/lib/tagClass.php 2007-12-19 01:41:33 UTC (rev 710) +++ releases/1.1/lib/tagClass.php 2007-12-19 02:01:13 UTC (rev 711) @@ -53,8 +53,12 @@ * @return (array) PASS: contains tag_name_id=>name array. * @return (exception) database error or no rows. */ - public function get_tag_list($getAllData=FALSE) { - $sql = "SELECT * FROM tag_name_table ORDER BY modifier, lower(name)"; + public function get_tag_list($getAllData=FALSE, $orderByMod=FALSE) { + $orderBy = "ORDER BY lower(name)"; + if($orderByMod) { + $orderBy = "ORDER BY modifier, lower(name)"; + } + $sql = "SELECT * FROM tag_name_table ". $orderBy; $numrows = $this->db->exec($sql); $dberror = $this->db->errorMsg(); @@ -144,7 +148,8 @@ $sqlArr = array ( 'record_id' => cleanString($recordId, 'numeric') ); - $sql = "SELECT tag_name_id, name FROM tag_name_table INNER JOIN tag_table USING (tag_name_id) WHERE ". string_from_array($sqlArr, 'select'); + $sql = "SELECT tag_name_id, name FROM tag_name_table INNER JOIN tag_table USING (tag_name_id) " . + "WHERE ". string_from_array($sqlArr, 'select') .' ORDER BY lower(name)'; $numrows = $this->db->exec($sql); $dberror = $this->db->errorMsg(); @@ -285,7 +290,7 @@ //========================================================================= - private function update_tag_record($critArr, array $changes) { + private function update_tag_record(array $critArr, array $changes) { $updateStr = string_from_array($changes, 'update'); $criteria = string_from_array($critArr, 'select', NULL, 'numeric'); $sql = "UPDATE tag_table SET ". $updateStr ."" . @@ -440,6 +445,53 @@ return($retval); }//end create_new_tag_name() //========================================================================= + + + + //========================================================================= + private function update_tag_name_record(array $critArr, array $changes) { + $updateStr = string_from_array($changes, 'update'); + $criteria = string_from_array($critArr, 'select', NULL, 'numeric'); + $sql = "UPDATE tag_name_table SET ". $updateStr ."" . + "WHERE ". $criteria; + + //start a transaction & run the update. + $numrows = $this->db->exec($sql); + $this->lastError = $this->db->errorMsg(); + + if(strlen($this->lastError) || $numrows !== 1) { + //something bad happened. + $retval = 0; + if(strlen($this->lastError)) { + //make it apparent that something went wrong. + $this->logsObj->log_dberror(__METHOD__ .": unable to update ($numrows) or dberror::: ". $this->lastError); + $retval = NULL; + } + } + else { + //good to go. + $retval = $numrows; + $this->logsObj->log_by_class("Updated tag record::: ". $updateStr ."\nCRITERIA::: ". $criteria, 'system'); + } + + return($retval); + }//end update_tag_name_record() + //========================================================================= + + + + //========================================================================= + public function update_tag_modifier($tagNameId, $modifier) { + if(is_numeric($tagNameId) && is_numeric($modifier)) { + $retval = $this->update_tag_name_record(array('tag_name_id' => $tagNameId), array('modifier' => $modifier)); + } + else { + throw new exception(__METHOD__ .": invalid input given..."); + } + + return($retval); + }//end update_tag_modifier() + //========================================================================= } ?> \ No newline at end of file Copied: releases/1.1/public_html/images/bullet-round.png (from rev 710, trunk/public_html/images/bullet-round.png) =================================================================== (Binary files differ) Property changes on: releases/1.1/public_html/images/bullet-round.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: releases/1.1/public_html/images/icon-help.png (from rev 710, trunk/public_html/images/icon-help.png) =================================================================== (Binary files differ) Property changes on: releases/1.1/public_html/images/icon-help.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: releases/1.1/public_html/images/icons (from rev 710, trunk/public_html/images/icons) Deleted: releases/1.1/public_html/images/icons/12-em-check.png =================================================================== (Binary files differ) Copied: releases/1.1/public_html/images/icons/12-em-check.png (from rev 710, trunk/public_html/images/icons/12-em-check.png) =================================================================== (Binary files differ) Property changes on: releases/1.1/public_html/images/icons/12-em-check.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: releases/1.1/public_html/images/icons/12-em-cross.png =================================================================== (Binary files differ) Copied: releases/1.1/public_html/images/icons/12-em-cross.png (from rev 710, trunk/public_html/images/icons/12-em-cross.png) =================================================================== (Binary files differ) Property changes on: releases/1.1/public_html/images/icons/12-em-cross.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: releases/1.1/public_html/images/icons/12-em-down.png =================================================================== (Binary files differ) Copied: releases/1.1/public_html/images/icons/12-em-down.png (from rev 710, trunk/public_html/images/icons/12-em-down.png) =================================================================== (Binary files differ) Property changes on: releases/1.1/public_html/images/icons/12-em-down.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: releases/1.1/public_html/images/icons/12-em-pencil.png =================================================================== (Binary files differ) Copied: releases/1.1/public_html/images/icons/12-em-pencil.png (from rev 710, trunk/public_html/images/icons/12-em-pencil.png) =================================================================== (Binary files differ) Property changes on: releases/1.1/public_html/images/icons/12-em-pencil.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: releases/1.1/public_html/images/icons/12-em-plus.png =================================================================== (Binary files differ) Copied: releases/1.1/public_html/images/icons/12-em-plus.png (from rev 710, trunk/public_html/images/icons/12-em-plus.png) =================================================================== (Binary files differ) Property changes on: releases/1.1/public_html/images/icons/12-em-plus.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: releases/1.1/public_html/images/icons/12-em-up.png =================================================================== (Binary files differ) Copied: releases/1.1/public_html/images/icons/12-em-up.png (from rev 710, trunk/public_html/images/icons/12-em-up.png) =================================================================== (Binary files differ) Property changes on: releases/1.1/public_html/images/icons/12-em-up.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: releases/1.1/public_html/images/icons/16-arrow-down.png =================================================================== (Binary files differ) Copied: releases/1.1/public_html/images/icons/16-arrow-down.png (from rev 710, trunk/public_html/images/icons/16-arrow-down.png) =====================... [truncated message content] |
From: <cra...@us...> - 2007-12-19 01:41:38
|
Revision: 710 http://cs-project.svn.sourceforge.net/cs-project/?rev=710&view=rev Author: crazedsanity Date: 2007-12-18 17:41:33 -0800 (Tue, 18 Dec 2007) Log Message: ----------- *** RELEASE 1.1.0-BETA16 *** SUMMARY OF CHANGES: * Formatting of helpdesk issue body & notes without "pre" tags. * More formatting of issue body & notes. * No longer wordwrap() note body in main noteClass. * Cleaning note body. * Format issue notes without the "pre" tag. * admin interface for tags * Updated tag listing. * Helpdesk converts newlines to BR's in body again (internal & external). * Ordering options for tags, ability to change modifier for tag name. * Updated block row name to match code, form to change modifier, etc (tags). * Add the "tags" section back (infobar). * Code to better display tags, option to update modifier, list alphabetically. * Folder for icons from "Sweetie-BasePack-v3" * help links * status messages show icon in title for prettiness. :) * After re-linking an issue, message now shows link back to previous project. * Force noteClass to format note data for uniform display. * Fix header (of SQL files) to have proper SVN keywords & such. * Ability to change helpdesk issue name (issue #70). * Fix order of tags when viewing issue (#123). * Fix initial priority based on tag modifier (#77). * Display ancestry link list instead of just project name on summary (#101). * Use block rows to display input or text for open/closed issue (#119). * Display currently logged-in user (#71). * Update to new version of cs-content. * More help pages & help links! Modified Paths: -------------- trunk/VERSION Modified: trunk/VERSION =================================================================== --- trunk/VERSION 2007-12-19 01:31:11 UTC (rev 709) +++ trunk/VERSION 2007-12-19 01:41:33 UTC (rev 710) @@ -1,4 +1,4 @@ $Id:VERSION 628 2007-11-20 16:58:45Z crazedsanity $ -VERSION: 1.1.0-BETA15 +VERSION: 1.1.0-BETA16 $HeadURL:https://cs-project.svn.sourceforge.net/svnroot/cs-project/trunk/VERSION $ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-19 01:31:15
|
Revision: 709 http://cs-project.svn.sourceforge.net/cs-project/?rev=709&view=rev Author: crazedsanity Date: 2007-12-18 17:31:11 -0800 (Tue, 18 Dec 2007) Log Message: ----------- Help links. Modified Paths: -------------- trunk/templates/content/helpdesk/view.content.tmpl Modified: trunk/templates/content/helpdesk/view.content.tmpl =================================================================== --- trunk/templates/content/helpdesk/view.content.tmpl 2007-12-19 01:30:43 UTC (rev 708) +++ trunk/templates/content/helpdesk/view.content.tmpl 2007-12-19 01:31:11 UTC (rev 709) @@ -17,14 +17,22 @@ <table cellpadding="3" cellspacing="0" width="100%" border="0"> <tr> <th align="right">Issue Number:</th> - <td>{public_id} [<b><a href="/extern/helpdesk/view?ID={public_id}">External Link</a></b>]</td> + <td>{public_id} [<b><a href="/extern/helpdesk/view?ID={public_id}">External Link</a></b>] + + <a href="/help/helpdesk/external_link" target="_blank"> + <img src="/images/icon-help.png" border="0"></a></td> <td rowspan="4" align="left" nowrap> <!-- BEGIN access_block --> <table border="1" cellpadding="2" cellspacing="0" align="left" style="padding-right:10px;border:none;"> <tr> - <td style="border-left:solid #000 1px;border-top:solid #000 1px;">Assigned: </td> + <td style="border-left:solid #000 1px;border-top:solid #000 1px;">Assigned: + + <a href="/help/helpdesk/assigned" target="_blank"> + <img src="/images/icon-help.png" border="0"></a> + </td> + <td style="border-right:solid #000 1px;border-top:solid #000 1px;" nowrap> <!-- BEGIN assigned_optionList --> <select name="updates[leader_contact_id]"> @@ -37,7 +45,10 @@ </td> </tr> <tr> - <td style="border-left:solid #000 1px;">Priority: </td> + <td style="border-left:solid #000 1px;">Priority: + <a href="/help/helpdesk/priority" target="_blank"> + <img src="/images/icon-help.png" border="0"></a> + </td> <td style="border-right:solid #000 1px"> <!-- BEGIN priority_optionList --> @@ -51,7 +62,12 @@ </tr> <tr> <td colspan="2" align="center" style="border-left:solid #000 1px;border-right:solid #000 1px"> - Attached to project:<br>[ <b>{ancestryLinkList}</b> ] + Attached to project: + + <a href="/help/helpdesk/project_linkage" target="_blank"> + <img src="/images/icon-help.png" border="0"></a> + + <br>[ <b>{ancestryLinkList}</b> ] </td> </tr> <!-- BEGIN linkToIssue --> @@ -75,7 +91,10 @@ <table border="0" cellpadding="3" cellspacing="0" width="200" align="center" style="border:solid #000 1px;"> <tr> - <th colspan="2" style="background-color:#FFF">Notified Users</th> + <th colspan="2" style="background-color:#FFF"> + Notified Users <a href="/help/helpdesk/notified_users" target="_blank"> + <img src="/images/icon-help.png" border="0"></a> + </th> </tr> <tr> <th style="border:solid #000 1px;">Name</th> @@ -124,7 +143,10 @@ </tr> <tr> - <th align="right">Tags: </th> + <th align="right">Tags: + <a href="/help/tags" target="_blank"> + <img src="/images/icon-help.png" border="0"></a> + </th> <td colspan="2"> <!-- BEGIN removeable_tag --><a href="/content/tags/remove/%%tag_name_id%%/{record_id}">%%name%%</a>%%separator%% @@ -201,6 +223,10 @@ <!-- BEGIN owner_options --> <input name="action" value="solve" type="submit"> <!-- END owner_options --> + + + <a href="/help/helpdesk/submit_buttons" target="_blank"> + <img src="/images/icon-help.png" border="0"></a> </td> </tr> <!-- END buttons_row --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-19 01:30:46
|
Revision: 708 http://cs-project.svn.sourceforge.net/cs-project/?rev=708&view=rev Author: crazedsanity Date: 2007-12-18 17:30:43 -0800 (Tue, 18 Dec 2007) Log Message: ----------- Updated help pages. Modified Paths: -------------- trunk/templates/help/index.content.tmpl Added Paths: ----------- trunk/templates/help/helpdesk/ trunk/templates/help/helpdesk/assigned.content.tmpl trunk/templates/help/helpdesk/external_link.content.tmpl trunk/templates/help/helpdesk/helpdesk_links.shared.tmpl trunk/templates/help/helpdesk/index.content.tmpl trunk/templates/help/helpdesk/notified_users.content.tmpl trunk/templates/help/helpdesk/priority.content.tmpl trunk/templates/help/helpdesk/project_linkage.content.tmpl trunk/templates/help/helpdesk/submit_buttons.content.tmpl trunk/templates/help/tags/index.content.tmpl Property Changed: ---------------- trunk/templates/help/tags/modifier.content.tmpl Added: trunk/templates/help/helpdesk/assigned.content.tmpl =================================================================== --- trunk/templates/help/helpdesk/assigned.content.tmpl (rev 0) +++ trunk/templates/help/helpdesk/assigned.content.tmpl 2007-12-19 01:30:43 UTC (rev 708) @@ -0,0 +1,9 @@ + + + +<h2>Assigned User</h2> + +This is the user that has been assigned the given issue. Besides administrators, they are the only user that is allowed to solve the issue. + + +{helpdesk_links} \ No newline at end of file Property changes on: trunk/templates/help/helpdesk/assigned.content.tmpl ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/templates/help/helpdesk/external_link.content.tmpl =================================================================== --- trunk/templates/help/helpdesk/external_link.content.tmpl (rev 0) +++ trunk/templates/help/helpdesk/external_link.content.tmpl 2007-12-19 01:30:43 UTC (rev 708) @@ -0,0 +1,7 @@ +<h2>External Links</h2> + +When viewing a Helpdesk Issue, there is an "External Link" provided for developers, so they may send a link to users who are not registered. This URL allows +non-registered users to view the link without worrying about having to login.<BR><BR> + + +{helpdesk_links} \ No newline at end of file Property changes on: trunk/templates/help/helpdesk/external_link.content.tmpl ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/templates/help/helpdesk/helpdesk_links.shared.tmpl =================================================================== --- trunk/templates/help/helpdesk/helpdesk_links.shared.tmpl (rev 0) +++ trunk/templates/help/helpdesk/helpdesk_links.shared.tmpl 2007-12-19 01:30:43 UTC (rev 708) @@ -0,0 +1,13 @@ + +<br /><br /> +<h3>Topics:</h3> + +<a href="/help/helpdesk"><b>Helpdesk</b></a> +<ul> + <li><a href="/help/helpdesk/assigned">Assigned User</a></li> + <li><a href="/help/helpdesk/external_link">External Link</a></li> + <li><a href="/help/helpdesk/notified_users">Notified Users</a></li> + <li><a href="/help/helpdesk/priority">Priority</a></li> + <li><a href="/help/helpdesk/project_linkage">Project Linkage</a></li> + <li><a href="/help/helpdesk/submit_buttons">Submit Buttons</a></li> +</ul> \ No newline at end of file Property changes on: trunk/templates/help/helpdesk/helpdesk_links.shared.tmpl ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/templates/help/helpdesk/index.content.tmpl =================================================================== --- trunk/templates/help/helpdesk/index.content.tmpl (rev 0) +++ trunk/templates/help/helpdesk/index.content.tmpl 2007-12-19 01:30:43 UTC (rev 708) @@ -0,0 +1,9 @@ + + +<h2>The Helpdesk</h2> + +The Helpdesk is a system used to list issues that occur within a given project, whether it is client software, a web application, or just about anything else. Issues +are created to notify developers of bugs or request new features. Developers and users are notified whenever there is a change, or when the issue has been completed, +so everybody concerned is kept up-to-date.<BR><BR> + +{helpdesk_links} \ No newline at end of file Property changes on: trunk/templates/help/helpdesk/index.content.tmpl ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/templates/help/helpdesk/notified_users.content.tmpl =================================================================== --- trunk/templates/help/helpdesk/notified_users.content.tmpl (rev 0) +++ trunk/templates/help/helpdesk/notified_users.content.tmpl 2007-12-19 01:30:43 UTC (rev 708) @@ -0,0 +1,8 @@ + + + +<h2>Notified Users</h2> + +This lists all the users that will be notified of changes to an issue. + +{helpdesk_links} \ No newline at end of file Property changes on: trunk/templates/help/helpdesk/notified_users.content.tmpl ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/templates/help/helpdesk/priority.content.tmpl =================================================================== --- trunk/templates/help/helpdesk/priority.content.tmpl (rev 0) +++ trunk/templates/help/helpdesk/priority.content.tmpl 2007-12-19 01:30:43 UTC (rev 708) @@ -0,0 +1,21 @@ + + + +<h2>Issue Priority</h2> + +Issue priority indicates how important the issue is in and of itself, or as it pertains to a particular project. The meanings of priorities are +roughly as follows: +<br /> + +<pre> + 0 - Critical (causes crash, fatal error, or data corruption) + 1 - Very Important (no crash, but causes fatal error or data corruption) + 2-8 - Varying degrees of importance + 9 - New, not important, or superficial +</pre><BR> + +The priority of an issue is initially based upon the <a href="/help/tags/modifier">modifiers of tags</a> that have been assigned to it. After +creation, registered users can modify this to be whatever they desire. + + +{helpdesk_links} \ No newline at end of file Property changes on: trunk/templates/help/helpdesk/priority.content.tmpl ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/templates/help/helpdesk/project_linkage.content.tmpl =================================================================== --- trunk/templates/help/helpdesk/project_linkage.content.tmpl (rev 0) +++ trunk/templates/help/helpdesk/project_linkage.content.tmpl 2007-12-19 01:30:43 UTC (rev 708) @@ -0,0 +1,24 @@ + + +<h2>Project Linkage</h2> + +Helpdesk Issues are linked to projects to help developers and other registered users understand how they pertain to a project. +Take this project hierarchy for example: + +<pre> +Software Project (running) + +--> Version 1.x (running) + | +--> v1.1 (running) + | +--> v1.2 (pending) + +--> Version 2.x (pending) + +--> v2.1 (pending) +</pre> + + +When somebody creates a new issue, it is important to link this to the appropriate project. If a bug is being reported, and +it is linked to "v1.1", developers will immediately know that it exists in version 1.1 (and possibly in later versions). +Assigning the same bug to "Version 2.x" would indicate that it is in the newest version of the software. This makes a very +important difference to the developers, as it indicates where the problem has occurred. + + +{helpdesk_links} \ No newline at end of file Property changes on: trunk/templates/help/helpdesk/project_linkage.content.tmpl ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/templates/help/helpdesk/submit_buttons.content.tmpl =================================================================== --- trunk/templates/help/helpdesk/submit_buttons.content.tmpl (rev 0) +++ trunk/templates/help/helpdesk/submit_buttons.content.tmpl 2007-12-19 01:30:43 UTC (rev 708) @@ -0,0 +1,14 @@ + + +<h2>Submit Buttons</h2> + +The submit buttons on an issue work as follows: + +<ul> + <li>Remark: add a remark to the issue (requires info in the "Remark" box).</li> + <li>Modify: updates the issue (changes to priority or assigned user).</li> + <li>Solve: completes the issue after entering the solution (requires info in the "Solution" box).</li> + <li>Re-Open: opens the issue for modification and logs the action.</li> +</ul> + +{helpdesk_links} Property changes on: trunk/templates/help/helpdesk/submit_buttons.content.tmpl ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/templates/help/index.content.tmpl =================================================================== --- trunk/templates/help/index.content.tmpl 2007-12-19 00:14:45 UTC (rev 707) +++ trunk/templates/help/index.content.tmpl 2007-12-19 01:30:43 UTC (rev 708) @@ -5,4 +5,6 @@ <ul> <li><a href="/help/lost_password">Lost Password</a></li> + <li><a href="/help/helpdesk">Helpdesk</a></li> + <li><a href="/help/tags">Tags</a></li> </ul> Added: trunk/templates/help/tags/index.content.tmpl =================================================================== --- trunk/templates/help/tags/index.content.tmpl (rev 0) +++ trunk/templates/help/tags/index.content.tmpl 2007-12-19 01:30:43 UTC (rev 708) @@ -0,0 +1,6 @@ + + +<h2>What is a Tag?</h2> + +A tag is essentially something to help give more information at-a-glance about a given record. At creation time, a Helpdesk Issue can be linked to several different +tags with different <a href="/help/tags/modifier">modifiers</a>, which helps to determine <a href="/help/helpdesk/priority">priority</a>. \ No newline at end of file Property changes on: trunk/templates/help/tags/index.content.tmpl ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/templates/help/tags/modifier.content.tmpl ___________________________________________________________________ Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-19 00:14:53
|
Revision: 707 http://cs-project.svn.sourceforge.net/cs-project/?rev=707&view=rev Author: crazedsanity Date: 2007-12-18 16:14:45 -0800 (Tue, 18 Dec 2007) Log Message: ----------- Update to new version of cs-content. Modified Paths: -------------- trunk/lib/globalFunctions.php Modified: trunk/lib/globalFunctions.php =================================================================== --- trunk/lib/globalFunctions.php 2007-12-19 00:01:38 UTC (rev 706) +++ trunk/lib/globalFunctions.php 2007-12-19 00:14:45 UTC (rev 707) @@ -17,7 +17,7 @@ function get_required_external_lib_versions($projectName=NULL) { //format: {className} => array({projectName} => {exactVersion}) $requirements = array( - 'contentSystem' => array('cs-content', '0.10.5'), + 'contentSystem' => array('cs-content', '0.10.6'), 'XMLParser' => array('cs-phpxml', '0.5.5'), 'arrayToPath' => array('cs-arrayToPath', '0.2.2') ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-19 00:01:42
|
Revision: 706 http://cs-project.svn.sourceforge.net/cs-project/?rev=706&view=rev Author: crazedsanity Date: 2007-12-18 16:01:38 -0800 (Tue, 18 Dec 2007) Log Message: ----------- Display currently logged-in user (#71). Modified Paths: -------------- trunk/includes/content.inc trunk/templates/infobar.shared.tmpl Modified: trunk/includes/content.inc =================================================================== --- trunk/includes/content.inc 2007-12-18 22:52:16 UTC (rev 705) +++ trunk/includes/content.inc 2007-12-19 00:01:38 UTC (rev 706) @@ -39,6 +39,17 @@ $user = new userClass($page->db, $_SESSION['uid']); +if(is_numeric($_SESSION['login_contact_id'])) { + $contactObj = new contactClass($page->db); + $contactObj->set_contact_id($_SESSION['login_contact_id']); + $contactData = $contactObj->get_contact(); + + $page->add_template_var('LOGGED_USERNAME', $_SESSION['login_username']); + $page->add_template_var('LOGGED_CONTACT_ID', $_SESSION['login_contact_id']); + $page->add_template_var('LOGGED_CONTACT_NAME', $contactData['fname'] .' '. $contactData['lname']); + $page->add_template_var('LOGGED_COMPANY', $contactData['company']); +} + if(!$page->ui->get_cache("userData/settings")) { $page->ui->set_cache("userData/settings", $user->get_settings()); } Modified: trunk/templates/infobar.shared.tmpl =================================================================== --- trunk/templates/infobar.shared.tmpl 2007-12-18 22:52:16 UTC (rev 705) +++ trunk/templates/infobar.shared.tmpl 2007-12-19 00:01:38 UTC (rev 706) @@ -1,27 +1,48 @@ <table cellpadding=0 cellspacing=0 border=0> <tr> - <td rowspan=2 valign=top nowrap><a href="/content/{module}" target='_top'> - <img src='/images/logo.gif' alt='CS-Project {cs-content_version}' border='0'></a><BR> - <font size="-7">version {cs-project_version}</font> + <td> + <table border="0"> + <tr> + <td valign=top nowrap><a href="/content/{module}" target='_top'> + <img src='/images/logo.gif' alt='CS-Project {cs-content_version}' border='0'></a><BR> + <font size="-7">version {cs-project_version}</font> + </td> + + <td width="100%"> + <h2 style="display:inline;"><u>Current User</u></h2><BR> + <h3 style="display:inline;">{LOGGED_COMPANY}</h3><br> + <h4 style="display:inline;">{LOGGED_CONTACT_NAME} (<a href="/content/contacts/view/{LOGGED_CONTACT_ID}">{LOGGED_USERNAME}</a>)</h4> + </td> + </tr> + </table> </td> - <td rowspan=2><img src='/images/pixel_clear.gif' border='0' width=3 height=10></td> - <td rowspan=2 colspan=30><img src='/images/pixel_clear.gif' border='0' height=25></td> </tr> <tr> - {tabs} - - <td valign=top align="right"><img src='/images/tab_left_inactive.gif' border='0' height="100%"></td> - <td id='notselected' valign=top><a id='notselected' href='/login.php?logout=1' target='_top'>Logout</a></td> - <td valign=top><img src='/images/tab_right_inactive.gif' border='0' height="100%"> </td> - - <form action="/content" method=get> - <td valign=top align="right"><img src='/images/tab_left_inactive.gif' border='0' height="100%"></td> - <td id='notselected' valign=top><input type=hidden name='module' value='projects'> - <input type="hidden" name="version" value="{cs-project_version}"> - <select name=changeGroup onchange='document.forms[0].submit()'> - {group_option_list} - </select></form> + <td> + <table border="0" cellpadding=0 cellspacing=0> + <tr> + {tabs} + + <td valign=top align="right"><img src='/images/tab_left_inactive.gif' border='0' height="100%"></td> + + <td id='notselected' valign=top><a id='notselected' href='/login.php?logout=1' target='_top'>Logout</a></td> + + <td valign=top><img src='/images/tab_right_inactive.gif' border='0' height="100%"> </td> + + <td valign=top align="right"><img src='/images/tab_left_inactive.gif' border='0' height="100%"></td> + + <td id='notselected' valign=top><input type=hidden name='module' value='projects'> + <form action="/content" method=get> + <input type="hidden" name="version" value="{cs-project_version}"> + <select name=changeGroup onchange='document.forms[0].submit()'> + {group_option_list} + </select> + </form> + </td> + + <td valign=top><img src='/images/tab_right_inactive.gif' border='0' height="100%"> </td> + </tr> + </table> </td> - <td valign=top><img src='/images/tab_right_inactive.gif' border='0' height="100%"> </td> </tr> </table> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-18 22:52:20
|
Revision: 705 http://cs-project.svn.sourceforge.net/cs-project/?rev=705&view=rev Author: crazedsanity Date: 2007-12-18 14:52:16 -0800 (Tue, 18 Dec 2007) Log Message: ----------- Use block rows to display input or text for open/closed issue (#119). Modified Paths: -------------- trunk/includes/content/helpdesk.inc trunk/templates/content/helpdesk/view.content.tmpl Modified: trunk/includes/content/helpdesk.inc =================================================================== --- trunk/includes/content/helpdesk.inc 2007-12-18 22:19:20 UTC (rev 704) +++ trunk/includes/content/helpdesk.inc 2007-12-18 22:52:16 UTC (rev 705) @@ -279,9 +279,13 @@ $assignedStr = $helpdeskData['leader_contact_id']; if($helpdeskData['status_id'] == 4) { //allow the current user to re-open this issue. + $doNotRipRows[] = "assigned_text"; + $doNotRipRows[] = "priority_text"; $doNotRipRows[] = "reopen_button"; } else { + $doNotRipRows[] = "assigned_optionList"; + $doNotRipRows[] = "priority_optionList"; if(($assignedStr == $_SESSION['contact_id']) || ($assignedStr == "" || is_null($assignedStr))) { //well, we can show 'em the update/modify button. $doNotRipRows[] = "update_button"; Modified: trunk/templates/content/helpdesk/view.content.tmpl =================================================================== --- trunk/templates/content/helpdesk/view.content.tmpl 2007-12-18 22:19:20 UTC (rev 704) +++ trunk/templates/content/helpdesk/view.content.tmpl 2007-12-18 22:52:16 UTC (rev 705) @@ -26,19 +26,27 @@ <tr> <td style="border-left:solid #000 1px;border-top:solid #000 1px;">Assigned: </td> <td style="border-right:solid #000 1px;border-top:solid #000 1px;" nowrap> + <!-- BEGIN assigned_optionList --> <select name="updates[leader_contact_id]"> {user_assign_list} </select> [<b>{assigned}</b>] + <!-- END assigned_optionList --> + <!-- BEGIN assigned_text --><b>{assigned}</b> + <!-- END assigned_text --> </td> </tr> <tr> <td style="border-left:solid #000 1px;">Priority: </td> <td style="border-right:solid #000 1px"> + <!-- BEGIN priority_optionList --> <select name="updates[priority]"> {select_priority_list} </select> + <!-- END priority_optionList --> + <!-- BEGIN priority_text --> {priority} + <!-- END priority_text --> </td> </tr> <tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-18 22:19:23
|
Revision: 704 http://cs-project.svn.sourceforge.net/cs-project/?rev=704&view=rev Author: crazedsanity Date: 2007-12-18 14:19:20 -0800 (Tue, 18 Dec 2007) Log Message: ----------- Display ancestry link list instead of just project name on summary (#101). Modified Paths: -------------- trunk/includes/content/summary.inc trunk/templates/content/summary/index.content.tmpl Modified: trunk/includes/content/summary.inc =================================================================== --- trunk/includes/content/summary.inc 2007-12-18 22:09:28 UTC (rev 703) +++ trunk/includes/content/summary.inc 2007-12-18 22:19:20 UTC (rev 704) @@ -130,7 +130,6 @@ function process_row(&$page, $projectArr, $expandArr, $baseRow, $level=0) { //loop through the array... $linkLevel = $level+1; - //pre-pad subprojects, so they appear indented. if($level > 0) { @@ -140,7 +139,16 @@ } } if(is_array($projectArr)) { + + $projObj = new projectClass($page->db); + foreach($projectArr as $id=>$subArr) { + + $subArr['linkList'] = $projObj->get_ancestry_link_list($id); + if(!strlen($subArr['linkList'])) { + $subArr['linkList'] = $subArr['name']; + } + //parse stuff into the template row... $rowColor1 = swapValue($rowColor1, "rgb(213, 213, 213)", "rgb(194, 194, 194)"); $rowColor2 = swapValue($rowColor2,"#D5D5D5", "#C2C2C2"); Modified: trunk/templates/content/summary/index.content.tmpl =================================================================== --- trunk/templates/content/summary/index.content.tmpl 2007-12-18 22:09:28 UTC (rev 703) +++ trunk/templates/content/summary/index.content.tmpl 2007-12-18 22:19:20 UTC (rev 704) @@ -21,7 +21,7 @@ onmouseout="this.style.backgroundColor ='%%rowColor2%%'" onclick="location.href = '/content/project/view?ID=%%id%%'"> - <td><a href="/content/project/view/?ID=%%id%%">%%name%%</a> </td> + <td><a href="/content/project/view/?ID=%%id%%">%%linkList%%</a> </td> <td>%%status_text%% </td> <td align="right" nowrap>%%progress%%%</td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-18 22:09:29
|
Revision: 703 http://cs-project.svn.sourceforge.net/cs-project/?rev=703&view=rev Author: crazedsanity Date: 2007-12-18 14:09:28 -0800 (Tue, 18 Dec 2007) Log Message: ----------- Fix initial priority based on tag modifier (#77). /lib/helpdeskClass.php: * create_record(): -- pass TRUE as arg #1 to tagClass::get_tag_list() so "modifier" is available (to change priority). Modified Paths: -------------- trunk/lib/helpdeskClass.php Modified: trunk/lib/helpdeskClass.php =================================================================== --- trunk/lib/helpdeskClass.php 2007-12-18 22:04:15 UTC (rev 702) +++ trunk/lib/helpdeskClass.php 2007-12-18 22:09:28 UTC (rev 703) @@ -297,7 +297,7 @@ if(is_array($dataArr['initialTag']) && count($dataArr['initialTag'])) { //get the list of tags, so we know what the total modifier is. - $allTags = $tagObj->get_tag_list(); + $allTags = $tagObj->get_tag_list(TRUE); foreach($dataArr['initialTag'] as $id) { $dataArr['priority'] += $allTags[$id]['modifier']; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-18 22:04:21
|
Revision: 702 http://cs-project.svn.sourceforge.net/cs-project/?rev=702&view=rev Author: crazedsanity Date: 2007-12-18 14:04:15 -0800 (Tue, 18 Dec 2007) Log Message: ----------- Fix order of tags when viewing issue (#123). /includes/content/helpdesk.inc: * set second arg for helpdeskClass::get_category_list() to TRUE. /lib/helpdeskClass.php: * get_category_list(): -- ARG CHANGE: NEW ARG: #2 ($orderByMod=FALSE) -- ability to pass arg #2 to tagClass::get_tag_list(). /lib/tagClass.php: * get_tag_list(): -- ARG CHANGE: #2 ($orderByMod=FALSE) -- changed default for $orderByMod to false. Modified Paths: -------------- trunk/includes/content/helpdesk.inc trunk/lib/helpdeskClass.php trunk/lib/tagClass.php Modified: trunk/includes/content/helpdesk.inc =================================================================== --- trunk/includes/content/helpdesk.inc 2007-12-18 21:44:28 UTC (rev 701) +++ trunk/includes/content/helpdesk.inc 2007-12-18 22:04:15 UTC (rev 702) @@ -221,7 +221,7 @@ $page->set_all_block_rows("content"); //show the "category" selection. - $categoryList = $proj->helpdeskObj->get_category_list('bug'); + $categoryList = $proj->helpdeskObj->get_category_list('bug', TRUE); $page->add_template_var("select_tags", $categoryList); // Modified: trunk/lib/helpdeskClass.php =================================================================== --- trunk/lib/helpdeskClass.php 2007-12-18 21:44:28 UTC (rev 701) +++ trunk/lib/helpdeskClass.php 2007-12-18 22:04:15 UTC (rev 702) @@ -410,10 +410,10 @@ /** * This returns a list of available TAGS (the "helpdesk_cat" table is deprecated) */ - function get_category_list($selectThis=NULL) { + function get_category_list($selectThis=NULL, $orderByMod=FALSE) { //create a list of tags. $object = new tagClass($this->db); - $mainTagList = $object->get_tag_list(TRUE); + $mainTagList = $object->get_tag_list(TRUE, $orderByMod); //create the "replacement array" and such. $tagList = array(); Modified: trunk/lib/tagClass.php =================================================================== --- trunk/lib/tagClass.php 2007-12-18 21:44:28 UTC (rev 701) +++ trunk/lib/tagClass.php 2007-12-18 22:04:15 UTC (rev 702) @@ -53,7 +53,7 @@ * @return (array) PASS: contains tag_name_id=>name array. * @return (exception) database error or no rows. */ - public function get_tag_list($getAllData=FALSE, $orderByMod=TRUE) { + public function get_tag_list($getAllData=FALSE, $orderByMod=FALSE) { $orderBy = "ORDER BY lower(name)"; if($orderByMod) { $orderBy = "ORDER BY modifier, lower(name)"; @@ -148,7 +148,8 @@ $sqlArr = array ( 'record_id' => cleanString($recordId, 'numeric') ); - $sql = "SELECT tag_name_id, name FROM tag_name_table INNER JOIN tag_table USING (tag_name_id) WHERE ". string_from_array($sqlArr, 'select'); + $sql = "SELECT tag_name_id, name FROM tag_name_table INNER JOIN tag_table USING (tag_name_id) " . + "WHERE ". string_from_array($sqlArr, 'select') .' ORDER BY lower(name)'; $numrows = $this->db->exec($sql); $dberror = $this->db->errorMsg(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-18 21:44:38
|
Revision: 701 http://cs-project.svn.sourceforge.net/cs-project/?rev=701&view=rev Author: crazedsanity Date: 2007-12-18 13:44:28 -0800 (Tue, 18 Dec 2007) Log Message: ----------- Ability to change helpdesk issue name (issue #70). Modified Paths: -------------- trunk/includes/content/helpdesk.inc trunk/templates/content/helpdesk/view.content.tmpl Modified: trunk/includes/content/helpdesk.inc =================================================================== --- trunk/includes/content/helpdesk.inc 2007-12-18 03:15:44 UTC (rev 700) +++ trunk/includes/content/helpdesk.inc 2007-12-18 21:44:28 UTC (rev 701) @@ -23,13 +23,29 @@ $_POST['updates']['parentRecordId'] = $_POST['updates']['project_id']; unset($_POST['updates']['project_id']); - //that means we've gotta update everything sent... right? + + //if they've changed the name, we gotta log it. + //TODO: probably log this within helpdeskClass::update(). + if(isset($_POST['updates']['name'])) { + //retrieve the old info. + $oldData = $proj->helpdeskObj->get_record($_POST['id']); + + if($oldData['name'] !== $_POST['updates']['name']) { + $addRemark = 'Updated [b]name[/b] from ([b][i]'. $oldData['name'] .'[/i][/b])'; + } + } + $doNotAcceptFields = array("solution", "remark"); foreach($doNotAcceptFields as $unsetThis) { unset($_POST['updates'][$unsetThis]); } $result = $proj->helpdeskObj->update_record($helpdeskId, $_POST['updates']); + if(strlen($addRemark)) { + $proj->helpdeskObj->remark($_POST['id'], $addRemark); + } + + //tell them what happened. if($result == 1) { set_message_wrapper(array( Modified: trunk/templates/content/helpdesk/view.content.tmpl =================================================================== --- trunk/templates/content/helpdesk/view.content.tmpl 2007-12-18 03:15:44 UTC (rev 700) +++ trunk/templates/content/helpdesk/view.content.tmpl 2007-12-18 21:44:28 UTC (rev 701) @@ -109,7 +109,10 @@ <tr> <th align="right">Title: </th> - <td colspan="2">{name}</td> + <td colspan="2"> + <div id="name_text" style="display:inline">{name} [<a href="#" onClick="enableInput('name');">Edit</a>]</div> + <div id="name_inputDiv" style="display:none"><input id="name_input" name="updates[name]" type="text" value="{name}" size="80" disabled></div> + </td> </tr> <tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-18 03:15:50
|
Revision: 700 http://cs-project.svn.sourceforge.net/cs-project/?rev=700&view=rev Author: crazedsanity Date: 2007-12-17 19:15:44 -0800 (Mon, 17 Dec 2007) Log Message: ----------- Class for retrieving invoice records and (probably) modifying them. Added Paths: ----------- branches/invoices/lib/invoiceViewer.class.php Copied: branches/invoices/lib/invoiceViewer.class.php (from rev 698, branches/invoices/lib/invoice.class.php) =================================================================== --- branches/invoices/lib/invoiceViewer.class.php (rev 0) +++ branches/invoices/lib/invoiceViewer.class.php 2007-12-18 03:15:44 UTC (rev 700) @@ -0,0 +1,36 @@ +<?php +/* + * This class was built to handle creation, searching, and updates of invoices. + * For searches involving items on the invoice, use invoiceItem{}. + * invoices is handled by + * + * SVN INFORMATION::: + * ------------------ + * SVN Signature::::::: $Id$ + * Last Author::::::::: $Author$ + * Current Revision:::: $Revision$ + * Repository Location: $HeadURL$ + * Last Updated:::::::: $Date$ + * + */ + +//TODO: log everything! + + +class invoiceViewer extends invoice { + + protected $gfObj; + protected $logsObj; + + + + //========================================================================= + public function __construct(cs_phpDB $db) { + $this->db = $db; + $this->gfObj = new cs_globalFunctions; + $this->gfObj->debugPrintOpt = DEBUGPRINTOPT; + $this->logsObj = new logsClass($this->db, 'Invoice Viewer'); + }//end __construct() + //========================================================================= +} +?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-18 03:12:05
|
Revision: 699 http://cs-project.svn.sourceforge.net/cs-project/?rev=699&view=rev Author: crazedsanity Date: 2007-12-17 19:12:01 -0800 (Mon, 17 Dec 2007) Log Message: ----------- Updated schema, more methods & such. Modified Paths: -------------- branches/invoices/docs/sql/upgrades/upgradeTo1.1.0-BETA16.sql branches/invoices/lib/invoiceItem.class.php branches/invoices/lib/invoiceTransaction.class.php Modified: branches/invoices/docs/sql/upgrades/upgradeTo1.1.0-BETA16.sql =================================================================== --- branches/invoices/docs/sql/upgrades/upgradeTo1.1.0-BETA16.sql 2007-12-18 02:56:12 UTC (rev 698) +++ branches/invoices/docs/sql/upgrades/upgradeTo1.1.0-BETA16.sql 2007-12-18 03:12:01 UTC (rev 699) @@ -42,7 +42,7 @@ invoice_item_id integer NOT NULL PRIMARY KEY, invoice_id integer NOT NULL REFERENCES invoice_table(invoice_id), description text NOT NULL, - unit_price decimal(10,2), + unit_price decimal(5,2), quantity integer NOT NULL DEFAULT 1 ); @@ -52,7 +52,10 @@ invoice_transaction_id integer NOT NULL PRIMARY KEY, invoice_id integer NOT NULL REFERENCES invoice_table(invoice_id), auth_string text NOT NULL, + name text text NOT NULL, number text NOT NULL, + trans_date date NOT NULL, + amount decimal(10,2) NOT NULL, date_created date NOT NULL DEFAULT CURRENT_DATE ); Modified: branches/invoices/lib/invoiceItem.class.php =================================================================== --- branches/invoices/lib/invoiceItem.class.php 2007-12-18 02:56:12 UTC (rev 698) +++ branches/invoices/lib/invoiceItem.class.php 2007-12-18 03:12:01 UTC (rev 699) @@ -65,6 +65,7 @@ 'quantity' => 'int' ); + $invoiceArr = array(); foreach($fields as $name=>$cleanType) { if(isset($data[$name]) && strlen($this->gfObj->cleanString($data[$name], $cleanType))) { $insertArr[$name] = $this->gfObj->cleanString($data[$name], $cleanType); Modified: branches/invoices/lib/invoiceTransaction.class.php =================================================================== --- branches/invoices/lib/invoiceTransaction.class.php 2007-12-18 02:56:12 UTC (rev 698) +++ branches/invoices/lib/invoiceTransaction.class.php 2007-12-18 03:12:01 UTC (rev 699) @@ -18,13 +18,96 @@ protected $gfObj; protected $logsObj; + private $invoiceId; + + const dbTable = 'invoice_transaction_table'; + const dbSeqName = 'invoice_transaction_table_invoice_transaction_id_seq'; + //========================================================================= - public function __construct(cs_phpDB $db) { + public function __construct(cs_phpDB $db, $invoiceId) { $this->db = $db; $this->gfObj = new cs_globalFunctions; $this->gfObj->debugPrintOpt = DEBUGPRINTOPT; $this->logsObj = new logsClass($this->db, 'Invoice Transaction'); + $this->set_invoice_id($invoiceId); }//end __construct() //========================================================================= + + + + //========================================================================= + /** + * Method to set internal invoiceId value. + */ + private function set_invoice_id($invoiceId) { + if(is_numeric($invoiceId)) { + $this->invoiceId = $invoiceId; + } + else { + throw new exception(_METHOD__ .': invalid data for invoice!'); + } + }//end set_invoice_id() + //========================================================================= + + + + //========================================================================= + /** + * Insert invoice transaction record into the database. + */ + public function create_invoice_transaction(array $data) { + if(is_numeric($this->invoiceId)) { + $fields = array( + 'auth_string' => 'sql', + 'name' => 'sql', + 'number' => 'sql', + 'trans_date' => 'date', + 'amount' => 'float' + ); + + $insertArr = array(); + foreach($fields as $name=>$cleanType) { + if(isset($data[$name]) && strlen($this->gfObj->cleanString($data[$name], $cleanType))) { + $insertArr[$name] = $this->gfObj->cleanString($data[$name], $cleanType); + } + else { + throw new exception(__METHOD__ .': invalid data for '. $name .': ('. $data['name'] .')'); + } + } + + $insertArr['invoice_id'] = $this->invoiceId; + $sql = 'INSERT INTO '. $this->dbTable .' '. $this->gfObj->string_from_array($insertArr, 'insert', NULL, 'sql'); + if($this->run_sql($sql) && !strlen($this->lastError)) { + $retval = $this->get_last_inserted_item(); + } + else { + throw new exception(__METHOD__ .': failed to insert item: '. $this->lastError); + } + } + else { + throw new exception(__METHOD__ .': no invoice_id set!'); + } + }//end create_invoice_transaction() + //========================================================================= + + + + //========================================================================= + /** + * Retrieve last invoice_transaction_id inserted. + */ + private function get_last_inserted_transaction_id() { + $sql = "SELECT currval('". $this->dbSeqName ."'::text)"; + if($this->run_sql($sql)) { + $data = $this->db->farray(); + $retval = $data[0]; + } + else { + throw new exception(__METHOD__ .': failed to retrieve last invoice_transaction_id: '. $this->lastError); + } + + return($retval); + }//end get_last_inserted_transaction_id() + //========================================================================= } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-18 02:56:15
|
Revision: 698 http://cs-project.svn.sourceforge.net/cs-project/?rev=698&view=rev Author: crazedsanity Date: 2007-12-17 18:56:12 -0800 (Mon, 17 Dec 2007) Log Message: ----------- New methods for creating invoice & items. Yay. Modified Paths: -------------- branches/invoices/lib/invoice.class.php branches/invoices/lib/invoiceItem.class.php Modified: branches/invoices/lib/invoice.class.php =================================================================== --- branches/invoices/lib/invoice.class.php 2007-12-18 02:24:03 UTC (rev 697) +++ branches/invoices/lib/invoice.class.php 2007-12-18 02:56:12 UTC (rev 698) @@ -16,6 +16,7 @@ //TODO: log everything! + class invoice extends dbAbstract { protected $gfObj; @@ -29,9 +30,6 @@ const mainTable = 'invoice_table'; const mainTableSeq = 'invoice_table_invoice_id_seq'; - const itemTable = 'invoice_item_table'; - const itemTableSeq = 'invoice_item_table_invoice_item_id_seq'; - const transTable = 'invoice_transaction_table'; const transTableSeq = 'invoice_transaction_table_invoice_transaction_id_seq'; @@ -86,9 +84,18 @@ //========================================================================= /** - * Add a line item to the invoice; should be an instance of invoiceItem{}. + * Add a line item to the invoice. */ - public function add_item(invoiceItem $item) { + public function add_item(array $data) { + if(is_numeric($this->invoiceId)) { + $invoiceItem = new invoiceItem($this->db, $this->invoiceId); + $retval = $invoiceItem->create_item($data); + } + else { + throw new exception(__METHOD__ .': no invoice created!'); + } + + return($retval); }//end add_item() //========================================================================= @@ -108,6 +115,8 @@ throw new exception(__METHOD__ .": failed to retrieve last invoice_id: ". $this->lastError); } + $this->invoiceId = $retval; + return($retval); }//end get_inserted_invoice_id() //========================================================================= Modified: branches/invoices/lib/invoiceItem.class.php =================================================================== --- branches/invoices/lib/invoiceItem.class.php 2007-12-18 02:24:03 UTC (rev 697) +++ branches/invoices/lib/invoiceItem.class.php 2007-12-18 02:56:12 UTC (rev 698) @@ -19,20 +19,93 @@ protected $gfObj; protected $logsObj; + const itemTable = 'invoice_item_table'; + const itemTableSeq = 'invoice_item_table_invoice_item_id_seq'; + + private $invoiceId; + //========================================================================= - public function __construct(cs_phpDB $db) { + public function __construct(cs_phpDB $db, $invoiceId=NULL) { $this->db = $db; $this->gfObj = new cs_globalFunctions; $this->gfObj->debugPrintOpt = DEBUGPRINTOPT; $this->logsObj = new logsClass($this->db, 'Invoice Item'); + + $this->set_invoice_id($invoiceId); }//end __construct() //========================================================================= //========================================================================= - public function create_item(array $data) { - }//end create_item() + /** + * Set value of internal invoiceId. + */ + protected function set_invoice_id($invoiceId) { + if(is_numeric($invoiceId)) { + $this->invoiceId = $invoiceId; + } + else { + throw new exception(__METHOD__ .': invalid data ('. $invoiceId .')'); + } + }//end set_invoice_id() //========================================================================= + + + + //========================================================================= + /** + * Insert item into the database. + */ + public function insert_item(array $data) { + if(is_numeric($this->invoiceId)) { + $fields = array( + 'description' => 'sql', + 'unit_price' => 'float', + 'quantity' => 'int' + ); + + foreach($fields as $name=>$cleanType) { + if(isset($data[$name]) && strlen($this->gfObj->cleanString($data[$name], $cleanType))) { + $insertArr[$name] = $this->gfObj->cleanString($data[$name], $cleanType); + } + else { + throw new exception(__METHOD__ .': invalid data for '. $name .': ('. $data['name'] .')'); + } + } + + $insertArr['invoice_id'] = $this->invoiceId; + $sql = 'INSERT INTO '. $this->itemTable .' '. $this->gfObj->string_from_array($insertArr, 'insert', NULL, 'sql'); + if($this->run_sql($sql) && !strlen($this->lastError)) { + $retval = $this->get_last_inserted_item(); + } + else { + throw new exception(__METHOD__ .': failed to insert item: '. $this->lastError); + } + } + else { + throw new exception(__METHOD__ .': no invoiceId set!'); + } + + return($retval); + }//end insert_item() + //========================================================================= + + + + //========================================================================= + private function get_last_inserted_item() { + $sql = "SELECT currval('". $this->itemTableSeq ."'::text)"; + if($this->run_sql($sql)) { + $data = $this->db->farray(); + $retval = $data[0]; + } + else { + throw new exception(__METHOD__ .': failed to retrieve last invoice_item_id: '. $this->lastError); + } + + return($retval); + }//end get_last_inserted_item() + //========================================================================= } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-18 02:24:11
|
Revision: 697 http://cs-project.svn.sourceforge.net/cs-project/?rev=697&view=rev Author: crazedsanity Date: 2007-12-17 18:24:03 -0800 (Mon, 17 Dec 2007) Log Message: ----------- Remove invoice stuff (now in it's own branch). Modified Paths: -------------- trunk/lib/invoice.class.php trunk/lib/invoiceItem.class.php trunk/public_html/.htaccess Removed Paths: ------------- trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA16.sql trunk/includes/test.inc trunk/lib/invoiceTransaction.class.php trunk/public_html/test trunk/public_html/test.php trunk/templates/test/ Deleted: trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA16.sql =================================================================== --- trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA16.sql 2007-12-18 02:21:31 UTC (rev 696) +++ trunk/docs/sql/upgrades/upgradeTo1.1.0-BETA16.sql 2007-12-18 02:24:03 UTC (rev 697) @@ -1,59 +0,0 @@ --- --- SVN INFORMATION::: --- --- SVN Signature::::::::: $Id$ --- Last Committted Date:: $Date$ --- Last Committed Path::: $HeadURL$ --- - - -CREATE TABLE invoice_status_table ( - invoice_status_id integer NOT NULL PRIMARY KEY, - name text NOT NULL UNIQUE, - description text NOT NULL UNIQUE, - is_updateable boolean NOT NULL DEFAULT FALSE -); - --- NOTE: by setting the invoice_status_id, we ensure they always get set properly, and new ones can't be readily inserted without specifying that too. -INSERT INTO invoice_status_table (invoice_status_id, name, description, is_updateable) VALUES (-1, 'W/0', 'Write Off', FALSE); -INSERT INTO invoice_status_table (invoice_status_id, name, description, is_updateable) VALUES (0, 'New', 'Open, pending changes', TRUE); -INSERT INTO invoice_status_table (invoice_status_id, name, description, is_updateable) VALUES (1, 'OK', 'Completed', FALSE); - -CREATE TABLE invoice_table ( - invoice_id integer NOT NULL PRIMARY KEY, - poc text, - company text, - address1 text, - address2 text, - phone text, - fax text, - city text, - state text, - zip text, - invoice_status_id integer NOT NULL DEFAULT 0 REFERENCES invoice_status_table(invoice_status_id), - creator_contact_id integer NOT NULL REFERENCES contact_table(contact_id), - billing_contact_id integer NOT NULL REFERENCES contact_table(contact_id), - is_proforma boolean NOT NULL DEFAULT FALSE, - date_created date NOT NULL DEFAULT CURRENT_DATE -); - - -CREATE TABLE invoice_item_table ( - invoice_item_id integer NOT NULL PRIMARY KEY, - invoice_id integer NOT NULL REFERENCES invoice_table(invoice_id), - description text NOT NULL, - unit_price decimal(10,2), - quantity integer NOT NULL DEFAULT 1 -); - - - -CREATE TABLE invoice_transaction_table ( - invoice_transaction_id integer NOT NULL PRIMARY KEY, - invoice_id integer NOT NULL REFERENCES invoice_table(invoice_id), - auth_string text NOT NULL, - number text NOT NULL, - date_created date NOT NULL DEFAULT CURRENT_DATE -); - - Deleted: trunk/includes/test.inc =================================================================== --- trunk/includes/test.inc 2007-12-18 02:21:31 UTC (rev 696) +++ trunk/includes/test.inc 2007-12-18 02:24:03 UTC (rev 697) @@ -1,79 +0,0 @@ -<?php -/* - * Created on Dec 13, 2007 - * - * SVN INFORMATION::: - * ------------------ - * Last Author::::::::: $Author$ - * Current Revision:::: $Revision$ - * Repository Location: $HeadURL$ - * Last Updated:::::::: $Date$ - - */ - - -$invoiceData = array( - 'invoice_id' => '10015', - 'poc' => 'Johnny Jackson', - 'company' => 'Llama Soft, Inc.', - 'address1' => '1555 North Georgia Ave.', - 'address2' => 'Suite 1411', - 'phone' => '(701) 555-3389 ext. 1911', - 'fax' => '(701) 555-9193', - 'city' => 'St. Louis', - 'state' => 'Missouri', - 'zip' => '55454' -); - -$invoiceItemData = array( - 91 => array( - 'invoice_item_id' => 91, - 'invoice_id' => 10015, - 'description' => 'Contract Downpayment', - 'unit_price' => 3000, - 'quantity' => 1 - ), - 93 => array( - 'invoice_item_id' => 93, - 'invoice_id' => 10015, - 'description' => 'Remote Software Development', - 'unit_price' => 75, - 'quantity' => 40 - ), - 94 => array( - 'invoice_item_id' => 94, - 'invoice_id' => 10015, - 'description' => 'Remote Software Development (overtime hours)', - 'unit_price' => 112.5, - 'quantity' => 12 - ) -); - - -$gf = new cs_globalFunctions; -$gf->debugPrintOpt = 1; - -$gf->debug_print("Here is the main invoice data::: ". $gf->debug_print($invoiceData,0)); - -$blockRows = $page->rip_all_block_rows(); - -if(!count($blockRows)) { - $gf->debug_print("Here's what I could find for block rows (should be more than just an empty array)::: ". $gf->debug_print($page->get_block_row_defs('content'),0)); - throw new exception("You forgot to give me valid block rows for parsing invoice items!"); -} -else { - $gf->debug_print("Here's the items that will be parsed into the rows::: ". $gf->debug_print($invoiceItemData,0)); - foreach($invoiceData as $index=>$value) { - $page->add_template_var($index, $value); - } - - //I have no idea how this will work when I don't know what the name of the block row is. - $tmplRow = array_pop($blockRows); - $allParsedRows = ""; - - foreach($invoiceItemData as $itemId=>$subData) { - $allParsedRows .= $page->gfObj->mini_parser($tmplRow, $subData, '{', '}'); - } -} - -?> Modified: trunk/lib/invoice.class.php =================================================================== --- trunk/lib/invoice.class.php 2007-12-18 02:21:31 UTC (rev 696) +++ trunk/lib/invoice.class.php 2007-12-18 02:24:03 UTC (rev 697) @@ -1,8 +1,5 @@ <?php /* - * This class was built to handle creation, searching, and updates of invoices. - * For searches involving items on the invoice, use invoiceItem{}. - * invoices is handled by * * SVN INFORMATION::: * ------------------ @@ -21,95 +18,20 @@ protected $gfObj; protected $logsObj; - private $invoiceId = NULL; - private $creatorContactId = NULL; - private $billingContactId = NULL; - - //set some internal things that should NEVER be changed after initialization. - const mainTable = 'invoice_table'; - const mainTableSeq = 'invoice_table_invoice_id_seq'; - - const itemTable = 'invoice_item_table'; - const itemTableSeq = 'invoice_item_table_invoice_item_id_seq'; - - const transTable = 'invoice_transaction_table'; - const transTableSeq = 'invoice_transaction_table_invoice_transaction_id_seq'; - //========================================================================= public function __construct(cs_phpDB $db) { $this->db = $db; $this->gfObj = new cs_globalFunctions; $this->gfObj->debugPrintOpt = DEBUGPRINTOPT; - $this->logsObj = new logsClass($this->db, 'Invoice'); + $this->logsObj = new logsClass($this->db, 'Authentication Token'); }//end __construct() //========================================================================= //========================================================================= - /** - * Method to handle creating the main invoice record. - */ - public function create_invoice(array $invoiceData, $isProforma=FALSE) { - $cleanFields = array( - 'poc','company', 'address1', 'address2', 'phone', 'fax', 'city', - 'state', 'zip' - ); - - $insertArr = array(); - foreach($invoiceData as $name=>$value) { - $insertArr[$name] = $this->gfObj->cleanString($value, 'sql'); - } - - if($isProforma === TRUE) { - $insertArr['is_proforma'] = 't'; - } - - $insertString = $this->gfObj->string_from_array($insertArr, 'insert', NULL, 'sql'); - - $sql = "INSERT INTO ". $this->mainTable .' '. $insertString; - - if($this->run_sql($sql)) { - //pull the new invoice id. - $retval = $this->get_inserted_invoice_id(); - } - else { - throw new exception(__METHOD__ .': failed to insert new invoice: '. $this->lastError ."<BR>\nSQL::: ". $sql); - } - - return($retval); - - }//end create_invoice() - //========================================================================= - - - - //========================================================================= - /** - * Add a line item to the invoice; should be an instance of invoiceItem{}. - */ public function add_item(invoiceItem $item) { }//end add_item() //========================================================================= - - - - //========================================================================= - /** - * Retrieve the invoice_id that was last inserted. - */ - private function get_inserted_invoice_id() { - $sql = "SELECT currval('". $this->mainTableSeq ."'::text)"; - if($this->run_sql($sql)) { - $data = $this->db->farray(); - $retval = $data[0]; - } - else { - throw new exception(__METHOD__ .": failed to retrieve last invoice_id: ". $this->lastError); - } - - return($retval); - }//end get_inserted_invoice_id() - //========================================================================= } ?> Modified: trunk/lib/invoiceItem.class.php =================================================================== --- trunk/lib/invoiceItem.class.php 2007-12-18 02:21:31 UTC (rev 696) +++ trunk/lib/invoiceItem.class.php 2007-12-18 02:24:03 UTC (rev 697) @@ -14,7 +14,7 @@ //TODO: log everything! -class invoiceItem extends invoice { +class invoiceItem extends dbAbstract { protected $gfObj; protected $logsObj; @@ -24,7 +24,7 @@ $this->db = $db; $this->gfObj = new cs_globalFunctions; $this->gfObj->debugPrintOpt = DEBUGPRINTOPT; - $this->logsObj = new logsClass($this->db, 'Invoice Item'); + $this->logsObj = new logsClass($this->db, 'Authentication Token'); }//end __construct() //========================================================================= Deleted: trunk/lib/invoiceTransaction.class.php =================================================================== --- trunk/lib/invoiceTransaction.class.php 2007-12-18 02:21:31 UTC (rev 696) +++ trunk/lib/invoiceTransaction.class.php 2007-12-18 02:24:03 UTC (rev 697) @@ -1,30 +0,0 @@ -<?php -/* - * - * SVN INFORMATION::: - * ------------------ - * SVN Signature::::::: $Id$ - * Last Author::::::::: $Author$ - * Current Revision:::: $Revision$ - * Repository Location: $HeadURL$ - * Last Updated:::::::: $Date$ - * - */ - -//TODO: log everything! - -class invoiceTransaction extends invoice { - - protected $gfObj; - protected $logsObj; - - //========================================================================= - public function __construct(cs_phpDB $db) { - $this->db = $db; - $this->gfObj = new cs_globalFunctions; - $this->gfObj->debugPrintOpt = DEBUGPRINTOPT; - $this->logsObj = new logsClass($this->db, 'Invoice Transaction'); - }//end __construct() - //========================================================================= -} -?> Modified: trunk/public_html/.htaccess =================================================================== --- trunk/public_html/.htaccess 2007-12-18 02:21:31 UTC (rev 696) +++ trunk/public_html/.htaccess 2007-12-18 02:24:03 UTC (rev 697) @@ -17,7 +17,4 @@ </files> <files help> ForceType application/x-httpd-php -</files> -<files test> - ForceType application/x-httpd-php </files> \ No newline at end of file Deleted: trunk/public_html/test =================================================================== --- trunk/public_html/test 2007-12-18 02:21:31 UTC (rev 696) +++ trunk/public_html/test 2007-12-18 02:24:03 UTC (rev 697) @@ -1,20 +0,0 @@ -<?php -/* - * Created on Mar 10, 2006 - * by - * Dan Falconer - */ - - -require_once(dirname(__FILE__) ."/../lib/site_config.php"); - -$db = new cs_phpDB; -$db->connect(get_config_db_params()); -$session = new Session($db); - -$GLOBALS['DEBUGPRINTOPT'] = DEBUGPRINTOPT; - -$contentObj = new contentSystem(); -$contentObj->handle_session($session); -$contentObj->finish(); -?> Deleted: trunk/public_html/test.php =================================================================== --- trunk/public_html/test.php 2007-12-18 02:21:31 UTC (rev 696) +++ trunk/public_html/test.php 2007-12-18 02:24:03 UTC (rev 697) @@ -1 +0,0 @@ -link test \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-18 02:21:35
|
Revision: 696 http://cs-project.svn.sourceforge.net/cs-project/?rev=696&view=rev Author: crazedsanity Date: 2007-12-17 18:21:31 -0800 (Mon, 17 Dec 2007) Log Message: ----------- Branch for creating invoices. Starting to consider postponing invoice stuff for a later release version. Added Paths: ----------- branches/invoices/ Copied: branches/invoices (from rev 695, trunk) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-14 18:16:54
|
Revision: 695 http://cs-project.svn.sourceforge.net/cs-project/?rev=695&view=rev Author: crazedsanity Date: 2007-12-14 10:13:16 -0800 (Fri, 14 Dec 2007) Log Message: ----------- Re-create the test files so xofrevlis can do test parsing of the invoice again (I hope). Using a Windows machine for development BLOWS. Added Paths: ----------- trunk/public_html/test trunk/public_html/test.php Copied: trunk/public_html/test (from rev 692, trunk/public_html/test) =================================================================== --- trunk/public_html/test (rev 0) +++ trunk/public_html/test 2007-12-14 18:13:16 UTC (rev 695) @@ -0,0 +1,20 @@ +<?php +/* + * Created on Mar 10, 2006 + * by + * Dan Falconer + */ + + +require_once(dirname(__FILE__) ."/../lib/site_config.php"); + +$db = new cs_phpDB; +$db->connect(get_config_db_params()); +$session = new Session($db); + +$GLOBALS['DEBUGPRINTOPT'] = DEBUGPRINTOPT; + +$contentObj = new contentSystem(); +$contentObj->handle_session($session); +$contentObj->finish(); +?> Copied: trunk/public_html/test.php (from rev 692, trunk/public_html/test.php) =================================================================== --- trunk/public_html/test.php (rev 0) +++ trunk/public_html/test.php 2007-12-14 18:13:16 UTC (rev 695) @@ -0,0 +1 @@ +link test \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-14 02:31:01
|
Revision: 694 http://cs-project.svn.sourceforge.net/cs-project/?rev=694&view=rev Author: crazedsanity Date: 2007-12-13 18:30:59 -0800 (Thu, 13 Dec 2007) Log Message: ----------- test Removed Paths: ------------- trunk/public_html/test Deleted: trunk/public_html/test =================================================================== --- trunk/public_html/test 2007-12-14 02:28:59 UTC (rev 693) +++ trunk/public_html/test 2007-12-14 02:30:59 UTC (rev 694) @@ -1,20 +0,0 @@ -<?php -/* - * Created on Mar 10, 2006 - * by - * Dan Falconer - */ - - -require_once(dirname(__FILE__) ."/../lib/site_config.php"); - -$db = new cs_phpDB; -$db->connect(get_config_db_params()); -$session = new Session($db); - -$GLOBALS['DEBUGPRINTOPT'] = DEBUGPRINTOPT; - -$contentObj = new contentSystem(); -$contentObj->handle_session($session); -$contentObj->finish(); -?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-14 02:29:04
|
Revision: 693 http://cs-project.svn.sourceforge.net/cs-project/?rev=693&view=rev Author: crazedsanity Date: 2007-12-13 18:28:59 -0800 (Thu, 13 Dec 2007) Log Message: ----------- Remove test.php... for xofrevlis. Removed Paths: ------------- trunk/public_html/test.php Deleted: trunk/public_html/test.php =================================================================== --- trunk/public_html/test.php 2007-12-14 01:53:03 UTC (rev 692) +++ trunk/public_html/test.php 2007-12-14 02:28:59 UTC (rev 693) @@ -1 +0,0 @@ -link test \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cra...@us...> - 2007-12-14 01:53:10
|
Revision: 692 http://cs-project.svn.sourceforge.net/cs-project/?rev=692&view=rev Author: crazedsanity Date: 2007-12-13 17:53:03 -0800 (Thu, 13 Dec 2007) Log Message: ----------- Files for xofrevlis to test invoice template parsing with... Modified Paths: -------------- trunk/public_html/.htaccess Added Paths: ----------- trunk/includes/test.inc trunk/public_html/test trunk/public_html/test.php trunk/templates/test/ Copied: trunk/includes/test.inc (from rev 690, trunk/includes/extern.inc) =================================================================== --- trunk/includes/test.inc (rev 0) +++ trunk/includes/test.inc 2007-12-14 01:53:03 UTC (rev 692) @@ -0,0 +1,79 @@ +<?php +/* + * Created on Dec 13, 2007 + * + * SVN INFORMATION::: + * ------------------ + * Last Author::::::::: $Author$ + * Current Revision:::: $Revision$ + * Repository Location: $HeadURL$ + * Last Updated:::::::: $Date$ + + */ + + +$invoiceData = array( + 'invoice_id' => '10015', + 'poc' => 'Johnny Jackson', + 'company' => 'Llama Soft, Inc.', + 'address1' => '1555 North Georgia Ave.', + 'address2' => 'Suite 1411', + 'phone' => '(701) 555-3389 ext. 1911', + 'fax' => '(701) 555-9193', + 'city' => 'St. Louis', + 'state' => 'Missouri', + 'zip' => '55454' +); + +$invoiceItemData = array( + 91 => array( + 'invoice_item_id' => 91, + 'invoice_id' => 10015, + 'description' => 'Contract Downpayment', + 'unit_price' => 3000, + 'quantity' => 1 + ), + 93 => array( + 'invoice_item_id' => 93, + 'invoice_id' => 10015, + 'description' => 'Remote Software Development', + 'unit_price' => 75, + 'quantity' => 40 + ), + 94 => array( + 'invoice_item_id' => 94, + 'invoice_id' => 10015, + 'description' => 'Remote Software Development (overtime hours)', + 'unit_price' => 112.5, + 'quantity' => 12 + ) +); + + +$gf = new cs_globalFunctions; +$gf->debugPrintOpt = 1; + +$gf->debug_print("Here is the main invoice data::: ". $gf->debug_print($invoiceData,0)); + +$blockRows = $page->rip_all_block_rows(); + +if(!count($blockRows)) { + $gf->debug_print("Here's what I could find for block rows (should be more than just an empty array)::: ". $gf->debug_print($page->get_block_row_defs('content'),0)); + throw new exception("You forgot to give me valid block rows for parsing invoice items!"); +} +else { + $gf->debug_print("Here's the items that will be parsed into the rows::: ". $gf->debug_print($invoiceItemData,0)); + foreach($invoiceData as $index=>$value) { + $page->add_template_var($index, $value); + } + + //I have no idea how this will work when I don't know what the name of the block row is. + $tmplRow = array_pop($blockRows); + $allParsedRows = ""; + + foreach($invoiceItemData as $itemId=>$subData) { + $allParsedRows .= $page->gfObj->mini_parser($tmplRow, $subData, '{', '}'); + } +} + +?> Modified: trunk/public_html/.htaccess =================================================================== --- trunk/public_html/.htaccess 2007-12-14 01:05:59 UTC (rev 691) +++ trunk/public_html/.htaccess 2007-12-14 01:53:03 UTC (rev 692) @@ -17,4 +17,7 @@ </files> <files help> ForceType application/x-httpd-php +</files> +<files test> + ForceType application/x-httpd-php </files> \ No newline at end of file Copied: trunk/public_html/test (from rev 690, trunk/public_html/extern) =================================================================== --- trunk/public_html/test (rev 0) +++ trunk/public_html/test 2007-12-14 01:53:03 UTC (rev 692) @@ -0,0 +1,20 @@ +<?php +/* + * Created on Mar 10, 2006 + * by + * Dan Falconer + */ + + +require_once(dirname(__FILE__) ."/../lib/site_config.php"); + +$db = new cs_phpDB; +$db->connect(get_config_db_params()); +$session = new Session($db); + +$GLOBALS['DEBUGPRINTOPT'] = DEBUGPRINTOPT; + +$contentObj = new contentSystem(); +$contentObj->handle_session($session); +$contentObj->finish(); +?> Added: trunk/public_html/test.php =================================================================== --- trunk/public_html/test.php (rev 0) +++ trunk/public_html/test.php 2007-12-14 01:53:03 UTC (rev 692) @@ -0,0 +1 @@ +link test \ No newline at end of file Property changes on: trunk/public_html/test.php ___________________________________________________________________ Name: svn:special + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |