Log of /contributions/modules/resource_conflict/resource_conflict.module

---

Revision 1.5 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Aug 5 16:01:53 2009 UTC (3 months, 3 weeks ago) by deviantintegral
Branch: MAIN
CVS Tags: DRUPAL-6--2-0, DRUPAL-6--2-0-RC1, HEAD
Changes since 1.4: +2 -2 lines
Diff to previous 1.4

#518844: Data too long for column 'type'.

---

Revision 1.1.2.5.2.17 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Aug 5 16:01:15 2009 UTC (3 months, 3 weeks ago) by deviantintegral
Branch: DRUPAL-5--2
CVS Tags: DRUPAL-5--2-1, DRUPAL-5--2-1-RC1
Changes since 1.1.2.5.2.16: +2 -2 lines
Diff to previous 1.1.2.5.2.16 , to branch point 1.1.2.5 , to next main 1.1.2.6

#518844: Data too long for column 'type'.

---

Revision 1.1.2.5.2.16 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Aug 5 15:32:51 2009 UTC (3 months, 3 weeks ago) by deviantintegral
Branch: DRUPAL-5--2
Changes since 1.1.2.5.2.15: +13 -15 lines
Diff to previous 1.1.2.5.2.15 , to branch point 1.1.2.5

#336705: Upgrade Date API integration to work with Date 2 API.

---

Revision 1.4 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Aug 5 15:31:26 2009 UTC (3 months, 3 weeks ago) by deviantintegral
Branch: MAIN
Changes since 1.3: +18 -20 lines
Diff to previous 1.3

#336705: Upgrade Date API integration to work with Date 2 API.

---

Revision 1.3 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Dec 10 17:42:55 2008 UTC (11 months, 2 weeks ago) by deviantintegral
Branch: MAIN
Changes since 1.2: +31 -13 lines
Diff to previous 1.2

#289351: kenorb, initial port to Drupal 6.

---

Revision 1.2 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Dec 10 17:29:50 2008 UTC (11 months, 2 weeks ago) by deviantintegral
Branch: MAIN
Changes since 1.1: +388 -57 lines
Diff to previous 1.1

Merging DRUPAL-5--2 back to HEAD for Drupal 6 branch.

---

Revision 1.1.2.5.2.15 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Sep 12 17:13:12 2008 UTC (14 months, 2 weeks ago) by deviantintegral
Branch: DRUPAL-5--2
CVS Tags: DRUPAL-5--2-0
Changes since 1.1.2.5.2.14: +14 -2 lines
Diff to previous 1.1.2.5.2.14 , to branch point 1.1.2.5

#289341: Warning if no resources have been created

---

Revision 1.1.2.5.2.14 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Aug 17 17:37:19 2008 UTC (15 months, 1 week ago) by dww
Branch: DRUPAL-5--2
Changes since 1.1.2.5.2.13: +10 -2 lines
Diff to previous 1.1.2.5.2.13 , to branch point 1.1.2.5

#295075: Fixed bug where not all resource conflicts were printed
simultaneously.  Due to limitations in FAPI, we need to make sure we
pass a unique key to form_set_error() for every resource/event pair.

---

Revision 1.1.2.5.2.13 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Aug 16 00:56:42 2008 UTC (15 months, 1 week ago) by deviantintegral
Branch: DRUPAL-5--2
Changes since 1.1.2.5.2.12: +12 -2 lines
Diff to previous 1.1.2.5.2.12 , to branch point 1.1.2.5

phpdoc updates for new function.

---

Revision 1.1.2.5.2.12 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Aug 16 00:53:13 2008 UTC (15 months, 1 week ago) by deviantintegral
Branch: DRUPAL-5--2
Changes since 1.1.2.5.2.11: +37 -15 lines
Diff to previous 1.1.2.5.2.11 , to branch point 1.1.2.5

#289346: Dates have to have a required end fields. If the requirements for resource conflict are detected to fail on the workflow form or on the node edit form, warn the administrator and disable completely until it is fixed and re-enabled.

---

Revision 1.1.2.5.2.11 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Aug 16 00:06:19 2008 UTC (15 months, 1 week ago) by deviantintegral
Branch: DRUPAL-5--2
Changes since 1.1.2.5.2.10: +24 -17 lines
Diff to previous 1.1.2.5.2.10 , to branch point 1.1.2.5

#289344: Duplicate Key Error if you event-enable and conflict-enable a type which contains date fields. The actual error was fixed in an earlier revision, but this set of changes makes handling content types with both date fields and event much easier to user.

---

Revision 1.1.2.5.2.10 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Aug 15 18:13:03 2008 UTC (15 months, 1 week ago) by deviantintegral
Branch: DRUPAL-5--2
Changes since 1.1.2.5.2.9: +31 -14 lines
Diff to previous 1.1.2.5.2.9 , to branch point 1.1.2.5

#295075: Usability: display all resource conflicts simultaneously and provide links. Also reverted previous change to rc_types storage as the error no longer exists. Ensure that all nodes checked are unique.

---

Revision 1.1.2.5.2.9 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Aug 15 17:27:15 2008 UTC (15 months, 1 week ago) by deviantintegral
Branch: DRUPAL-5--2
Changes since 1.1.2.5.2.8: +68 -27 lines
Diff to previous 1.1.2.5.2.8 , to branch point 1.1.2.5

#289338: Clean up messages and errors. Also fixed a minor bug from renaming the variables in #295571.

---

Revision 1.1.2.5.2.8 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Aug 15 00:52:17 2008 UTC (15 months, 1 week ago) by deviantintegral
Branch: DRUPAL-5--2
Changes since 1.1.2.5.2.7: +1 -3 lines
Diff to previous 1.1.2.5.2.7 , to branch point 1.1.2.5

Removing errant dpr()'s.

---

Revision 1.1.2.5.2.7 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Aug 15 00:51:38 2008 UTC (15 months, 1 week ago) by deviantintegral
Branch: DRUPAL-5--2
Changes since 1.1.2.5.2.6: +4 -2 lines
Diff to previous 1.1.2.5.2.6 , to branch point 1.1.2.5

Keep all enabled conflict types for conflict checking.

---

Revision 1.1.2.5.2.6 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Aug 15 00:26:33 2008 UTC (15 months, 1 week ago) by deviantintegral
Branch: DRUPAL-5--2
Changes since 1.1.2.5.2.5: +3 -3 lines
Diff to previous 1.1.2.5.2.5 , to branch point 1.1.2.5

#289348: Events can no longer have the same end / start times. This was actually much more serious causing all kinds of issues as the end time wasn't being passed properly.

---

Revision 1.1.2.5.2.5 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Aug 15 00:15:04 2008 UTC (15 months, 1 week ago) by deviantintegral
Branch: DRUPAL-5--2
Changes since 1.1.2.5.2.4: +20 -20 lines
Diff to previous 1.1.2.5.2.4 , to branch point 1.1.2.5

#295571: Long content type names exceed the maximum variable length on Drupal 5.

---

Revision 1.1.2.5.2.4 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Aug 14 23:23:47 2008 UTC (15 months, 1 week ago) by dww
Branch: DRUPAL-5--2
Changes since 1.1.2.5.2.3: +3 -3 lines
Diff to previous 1.1.2.5.2.3 , to branch point 1.1.2.5

#294578: Fixed table prefix bug introduced in revision 1.1.2.5.2.3.

---

Revision 1.1.2.5.2.3 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Aug 13 18:15:23 2008 UTC (15 months, 2 weeks ago) by deviantintegral
Branch: DRUPAL-5--2
Changes since 1.1.2.5.2.2: +13 -8 lines
Diff to previous 1.1.2.5.2.2 , to branch point 1.1.2.5

#294578: Allow CCK fields to exist in a seperate table for cases where a field is used in more than one content type.

---

Revision 1.1.2.6 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Aug 13 17:37:37 2008 UTC (15 months, 2 weeks ago) by deviantintegral
Branch: DRUPAL-5
Changes since 1.1.2.5: +29 -29 lines
Diff to previous 1.1.2.5 , to branch point 1.1 , to next main 1.5

#294594: Code style cleanup fixes by dww.

---

Revision 1.1.2.5.2.2 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Aug 13 17:25:53 2008 UTC (15 months, 2 weeks ago) by deviantintegral
Branch: DRUPAL-5--2
Changes since 1.1.2.5.2.1: +28 -28 lines
Diff to previous 1.1.2.5.2.1 , to branch point 1.1.2.5

#294594: Code style cleanup fixes by dww.

---

Revision 1.1.2.5.2.1 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Jul 31 03:44:08 2008 UTC (15 months, 3 weeks ago) by deviantintegral
Branch: DRUPAL-5--2
Changes since 1.1.2.5: +246 -60 lines
Diff to previous 1.1.2.5

#231445: Work with date API. New features include better code structure and cross-api integration between events and dates.

---

Revision 1.1.2.5 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Jun 28 17:39:43 2008 UTC (16 months, 4 weeks ago) by deviantintegral
Branch: DRUPAL-5
CVS Tags: DRUPAL-5--1-1
Branch point for: DRUPAL-5--2
Changes since 1.1.2.4: +2 -2 lines
Diff to previous 1.1.2.4 , to branch point 1.1

#251796: Fix default settings for node type form. Thanks!

---

Revision 1.1.2.4 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Jun 28 17:33:23 2008 UTC (16 months, 4 weeks ago) by deviantintegral
Branch: DRUPAL-5
Changes since 1.1.2.3: +5 -1 lines
Diff to previous 1.1.2.3 , to branch point 1.1

#231148: Fix invalid arguments when you have multiple resource conflict content types set up.

---

Revision 1.1.2.3 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Oct 16 23:10:34 2007 UTC (2 years, 1 month ago) by deviantintegral
Branch: DRUPAL-5
CVS Tags: DRUPAL-5--1-0
Changes since 1.1.2.2: +5 -6 lines
Diff to previous 1.1.2.2 , to branch point 1.1

#182858: Fixing issue with ending event times.

---

Revision 1.1.2.2 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Oct 16 22:21:08 2007 UTC (2 years, 1 month ago) by deviantintegral
Branch: DRUPAL-5
Changes since 1.1.2.1: +7 -3 lines
Diff to previous 1.1.2.1 , to branch point 1.1

#182858: Fixing incorrect use of db_fetch_array so that multiple results can properly be returned.

---

Revision 1.1.2.1 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Oct 16 17:44:40 2007 UTC (2 years, 1 month ago) by deviantintegral
Branch: DRUPAL-5
Changes since 1.1: +24 -8 lines
Diff to previous 1.1

#178897: Fixing errors with NULL or FALSE returns for variables used in foreach() loops. Added and cleaned up a few comments. When updating an existing node, bookings no longer conflict with themselves.

---

Revision 1.1 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Sep 19 18:26:05 2007 UTC (2 years, 2 months ago) by deviantintegral
Branch: MAIN
Branch point for: DRUPAL-5

Initial commit of resource_conflict. This module works with event and nodereference from CCK to allow for resources to be booked while preventing conflicts.