Commit Graph

46 Commits

Author SHA1 Message Date
Sam Minnee
550931c02a Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@72801 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-10 21:59:19 +00:00
Andrew O'Neil
fa76e64d48 Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@72452 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-04 03:35:29 +00:00
Sean Harvey
5141700f41 MINOR Re-added deprecated variable on MemberTableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71594 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-10 03:27:12 +00:00
Sean Harvey
aa69629a3c MINOR Added translatable error message for MemberTableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71389 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-04 21:13:04 +00:00
Sean Harvey
c4d3abcc29 ENHANCEMENT Show at most, 100 members in a group before paging required instead of 10
MINOR Removed setting of permissions since this never worked - use MemberTableField->setPermissions() instead
MINOR Deprecated the use of addMembershipFields() - use updateSummaryFields() on your Member decorator instead
MINOR Removed redundant code that wasn't being used

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71388 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-04 20:36:23 +00:00
Sean Harvey
34a50e3de6 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71276 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 03:46:15 +00:00
Sean Harvey
3680bbea46 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 03:22:20 +00:00
Ingo Schommer
7b3068ac4f MINOR Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69703 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-05 06:17:59 +00:00
Sam Minnee
a93a0c3c95 Updated SQL queries to be ansi compatable
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66402 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-23 00:31:13 +00:00
Sean Harvey
6afd96eba4 Reverted previous change, as MemberTableField has it's own use of sourceFilter - not the most documentation situation however.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65175 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-03 23:30:16 +00:00
Sean Harvey
0c650b20fb BUGFIX MemberTableField use of sourceFilter should be treated as a string, not an array as per the API of TableListField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65174 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-03 23:23:20 +00:00
Ingo Schommer
118efae75d BUGFIX Adjusted HeaderField and LabelField implementation to new constructor arguments (see r64421)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64423 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 13:27:12 +00:00
Sean Harvey
a0c107a338 BUGFIX MemberTableField_Popup had an odd way of overloading saveComplexTableField() - this should be on MemberTableField instead, since that's the direct subclass of ComplexTableField for where saveComplexTableField() is defined. This broke the "Add Member" button in CMS Security, probably due to the way the form URLs have been changed. See ticket #2907 for the reported problem.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63828 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-08 03:46:19 +00:00
Sean Harvey
d1572b1272 BUGFIX Fixed blatant error where $SNG_member wasn't defined
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63799 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-08 01:00:08 +00:00
Sean Harvey
5aac6f5693 BUGFIX MemberTableField->AddLink() was calling &methodName=add - this should be just "add", as per changes to the forum URLs in sapphire
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63793 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-08 00:07:53 +00:00
Sean Harvey
b4fb295a37 BUGFIX Removed query that was causing issues displaying members in the security groups. Open ticket #2591
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63786 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-07 23:01:46 +00:00
Ingo Schommer
4541dbb04e ENHANCEMENT Removed overloaded MemberTableField->DetailForm() and reduced overloaded constructor logic - same behaviour found in parent classes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63626 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-03 16:33:37 +00:00
Ingo Schommer
a322fbd59f ENHANCEMENT Introduced constants for system paths like /sapphire in preparation for a more flexible directory reorganisation. Instead of hardcoding your path, please use the following constants: BASE_PATH, BASE_URL, SAPPHIRE_DIR, SAPPHIRE_PATH, CMS_DIR, CMS_PATH, THIRDPARTY_DIR, THIRDPARTY_PATH, ASSETS_DIR, ASSETS_PATH, THEMES_DIR, THEMES_PATH
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63175 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-28 13:12:20 +00:00
Ingo Schommer
f79a49fa31 API CHANGE Deprecated Member::isInGroup() - use Member::inGroup() instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@62846 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-22 16:07:13 +00:00
Sam Minnee
03265942cc MemberTableField delete just removes the member from the group
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@62311 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-12 03:22:56 +00:00
Sam Minnee
725ba3a610 Fixed bugs in MemberTableField search
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@61614 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-27 04:58:34 +00:00
Hayden Smith
f74a39d1b0 Merged [47018]: Some additions made to use Object::create to allow MemberTableField to deal with subclasses of Member. Also merged a modification to MemberTableField::__construct that allowed greater control over the details form's fields (defaults to same behaviour as trunk), and MemberTableField::DetailForm, although this might need to be removed later.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60302 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 01:14:07 +00:00
Ingo Schommer
08beafbcdb (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60208 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 04:06:52 +00:00
Ingo Schommer
4b5ab8a997 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59969 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 06:54:59 +00:00
Ingo Schommer
a894ad377d MINOR Unified @package PHPdoc (added where missing, removed duplicates)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56212 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-15 13:33:53 +00:00
Sam Minnee
deaddc841d Merged revisions 52875 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/branches/govtsecurity

........
  r52875 | sminnee | 2008-04-16 20:12:35 +1200 (Wed, 16 Apr 2008) | 1 line
  
  Respect Member validation in the add-record part of MemberTableField
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53457 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:28:33 +00:00
Sam Minnee
0341a8685e Merged revisions 52797 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/branches/govtsecurity

........
  r52797 | sminnee | 2008-04-15 22:22:33 +1200 (Tue, 15 Apr 2008) | 1 line
  
  Fixed interaction of MemberTableField and member validation
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53456 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:28:20 +00:00
Ingo Schommer
6511df5ece #2310 MemberTableField Popup breaks after saving
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50947 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-12 09:24:59 +00:00
Ingo Schommer
ee12df16a4 Merged revisions 50805 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2

........
  r50805 | ischommer | 2008-03-11 10:23:53 +1300 (Tue, 11 Mar 2008) | 2 lines
  
  added $searchable_fields in preparation for a more generic search implementation, currently limited to Member.php and MemberTableField.php (mainly to fix bugs caused by r49774 and r47856)
  fixed weird indentation formatting in Member.php
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50801 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-10 21:28:15 +00:00
Matt Peel
66c3db1e8e Reverted geoffm's accidental commit to /open
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50107 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 02:10:37 +00:00
Geoff Munn
4475726ad6 First post
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50105 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 01:06:39 +00:00
Sam Minnee
2bdd8c782e Merged revisions 46525 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.1.0-rc3oriwave2

........
  r46525 | sminnee | 2007-12-10 15:10:56 +1300 (Mon, 10 Dec 2007) | 3 lines
  
  Added Member->SetPassword, a field that lets you have a write-only password field
  Used Member->SetPassword to create a password column on the MemberTableField for SecurityAdmin
  Send 'changed password' emails when a user is first created as well as edited
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49767 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:17:48 +00:00
Andrew O'Neil
033f55f5c1 Fix i18n errors
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47883 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-11 01:43:15 +00:00
Sam Minnee
1dea06a698 rbarreiros: #1907 - Patch for more i18n strings
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47849 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 22:27:38 +00:00
Sam Minnee
7d00a996b4 rbarreiros: #1918 Translate newsletter and other strings
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47832 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 03:28:13 +00:00
Sam Minnee
d9ac1a1f85 Improved API documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47798 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 00:33:49 +00:00
Sam Minnee
bfc448fa7f Added package tags and docblock info for API documentation
Fixed whitespace

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47726 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-08 06:41:55 +00:00
Ingo Schommer
fea3f62490 removed DetailForm() (was just needed to set custom class which is now in $popupClass), updated saveComplexTableField() to reflect parent class code
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47586 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-03 08:44:29 +00:00
Normann Lou
6544778094 push the hiddenfield ctf[ID] which is deleted by merging but it seems that we need it in any cases.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45677 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-26 21:19:02 +00:00
Normann Lou
a3f9d9b6d3 switch externals to trunk.
Inform-merge: from the changeset:
r32477: Merge 2.0-inform from trunk previously
r32478: Merge 2.0-inform from trunk previously
r32481: merge 2.0infom with lastes chunk 
r32483: merge 2.0infom with lastes chunk 
r33526: Final styling of all forms and combined communication form add/alter javascript for height adjustment of First / Second block 
r33580: styling for combined form communication in myinfom pages 
r33706: styling of combined form (communication) in Email 
r33881: made compatible to $extraClass 
r33885: added defaultVal
r33887: fixed typo 
r34728: modified SmallFieldHolder?()
r34729: added "validationError"-class 
r34914: WIP3866: Factfinder: Hide "self emplyed" block 
r34964: Change current plan upto TraumaInsurance? 
r35038: disabled friggin field focus 
r35230: #1032 Fixed hash-link insertion 
r35887: conditionally setting parameters in sourceID() - to avoid empty overrides
r35892: Saving value in SQL-compatible format (YYYY-MM-DD instead of DD/MM/YYYY), with fallback for non-sql values (just passed through without conversion) 
r35928: Removed "create a" from PageType?-dropdown, sorting alphabetically, falling back to $singular_name
r35990: branched off for membertablefield
r35994: fix for membertablefield
r36024: added array-condition needed for DMYDateField 
r36083: fix bug for compositeField -> dropDatalessField
r36394: removed debug code 
r36826: change wrong indent format 
r36828: WIP 4262: Logging out of My Inform goes to blank page
r36858: Fixed error caused in r12472 while merging to Session-class
r37132: Merged partial changesets from branches/2.0-nzct, only adding childID to detailform when not in add-mode 
r40815: add an unsubscribe record when a member subscribe a newslettertype 
r41113: fix the bug described in http://support.silverstripe.com/info/ticket/31: CRM not showing search results
r43226: fixed search (partial merge from trunk) 
r43268: merged createNewPassword() from trunk, was referencing a non-existinent global function randomString()


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45473 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-23 01:10:19 +00:00
Sean Harvey
a2d59ee1c7 Ticket #1498 - refactored the button css, it's now in layout.css instead of multiple files
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44326 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 02:53:40 +00:00
Ingo Schommer
83d500865e bfojcapell: strings replaced with _t() calls
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42134 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:33:05 +00:00
Ingo Schommer
eb73802bcd mlanthaler: Bugfix: Added isset() to prevent E_NOTICE error.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41916 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 20:11:06 +00:00
Ingo Schommer
d5d2006980 mlanthaler: Bugfix: Added isset() to prevent E_NOTICE error ($memberID isn't needed in the rest of the method).
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41915 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 20:10:43 +00:00
Ingo Schommer
c2f57b75de mlanthaler: Suppress E_NOTICE when $_REQUESTctf?childID? is not set (e.g. when adding a new member by clicking on "Add member" in the security tab).
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41805 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 19:39:59 +00:00
Hayden Smith
abb9a61d0d Moved CMS module to open source path
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39000 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-19 10:40:05 +00:00