Menu
▾
▴
[phpws-comm-commits] modules/rolodex/class RDX_Forms.php, 1.3, 1.4 RDX_Member.php, 1.2, 1.3 RDX_Mypage.php, 1.1.1.1, 1.2 Rolodex.php, 1.2, 1.3
|
From: Verdon V. <ve...@us...> - 2008-02-08 19:39:17
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12461/class Modified Files: RDX_Forms.php RDX_Member.php RDX_Mypage.php Rolodex.php Log Message: some tidy up, resolved list search and sort Index: RDX_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RDX_Forms.php 4 Feb 2008 19:29:43 -0000 1.3 --- RDX_Forms.php 8 Feb 2008 19:38:48 -0000 1.4 *************** *** 171,180 **** /* the default sort order */ ! $pager->setOrder($sortby, 'asc'); - /* experiments with advanced join for sort link - moved up to default sort logic */ - // $pager->joinResult('source_col', 'jointotable', 'jointocol', 'coltoreturn', 'optionalalias'); - // $pager->joinResult('rolodex_member.user_id', 'demographics', 'demographics.user_id', 'last_name', 'title'); - // $pager->joinResult('user_id', 'demographics', 'user_id', 'last_name', 'title'); /* setup the list page */ --- 171,176 ---- /* the default sort order */ ! $pager->setOrder($sortby, 'asc', true); /* setup the list page */ *************** *** 189,202 **** $vars2['tab'] = 'new'; if (isset($approved) && $approved == 1) { ! $ptags['EMPTY_MESSAGE'] = sprintf(dgettext('rolodex', 'Check your %s then create a %s to begin'), PHPWS_Text::secureLink(dgettext('rolodex', 'Settings'), 'rolodex', $vars), PHPWS_Text::secureLink(dgettext('rolodex', 'New Member'), 'rolodex', $vars2)); } } else { ! $ptags['EMPTY_MESSAGE'] = dgettext('rolodex', 'Sorry, no members are available at this time. Try broadening your search or returning later.'); } } $pager->addPageTags($ptags); $pager->addToggle('class="toggle1"'); ! /// $pager->setSearch('demographics.business_name', 'demographics.first_name', 'demographics.last_name'); ! $pager->setSearch('title'); /* debug stuff */ --- 185,198 ---- $vars2['tab'] = 'new'; if (isset($approved) && $approved == 1) { ! $pager->setEmptyMessage(sprintf(dgettext('rolodex', 'Check your %s then create a %s to begin'), PHPWS_Text::secureLink(dgettext('rolodex', 'Settings'), 'rolodex', $vars), PHPWS_Text::secureLink(dgettext('rolodex', 'New Member'), 'rolodex', $vars2))); } } else { ! $pager->setEmptyMessage(dgettext('rolodex', 'Sorry, no members are available at this time. Try broadening your search or returning later.')); } } $pager->addPageTags($ptags); $pager->addToggle('class="toggle1"'); ! // $pager->setSearch('last_name','title'); // the alias doesn't work here so we do the below ! $pager->setSearch('demographics.business_name', 'demographics.first_name', 'demographics.last_name'); /* debug stuff */ *************** *** 397,401 **** $form->addSubmit('save', dgettext('rolodex', 'Continue')); } else { - // $tpl['NO_USERS_NOTE'] = dgettext('rolodex', 'Sorry, there are no users available. You will have to create a user account first.'); $form->addTplTag('NO_USERS_NOTE', dgettext('rolodex', 'Sorry, there are no users available. You will have to create a user account first.')); } --- 393,396 ---- *************** *** 653,656 **** --- 648,673 ---- $tpl = $form->getTemplate(); + /* begin experiment with cats */ + $key = new Key($member->key_id); + PHPWS_Core::initModClass('categories', 'Categories.php'); + if (javascriptEnabled()) { + $js_vars['label'] = dgettext('categories', 'Categorize'); + $js_vars['width'] = 640; + $js_vars['height'] = 250; + + $vars['action'] = 'admin'; + $vars['subaction'] = 'set_item_category'; + $vars['key_id'] = $key->id; + + $js_vars['address'] = PHPWS_Text::linkAddress('categories', $vars, TRUE); + $link = javascript('open_window', $js_vars); + $tpl['CATS'] = $link; + } else { + $content = Categories::showForm($key); + $tpl['CATS'] = $content; + } + /* end experiment with cats */ + + if (Current_User::allow('rolodex', 'edit_member')) { $js_vars['form_name'] = 'rolodex_member'; *************** *** 684,688 **** $tpl['RESET_EXPIRED'] = PHPWS_Text::secureLink(sprintf(dgettext('rolodex', 'Reset all expiry dates to %s days from now'), PHPWS_Settings::get('rolodex', 'expiry_interval')), 'rolodex', array('aop'=>'reset_expired')); ! $tpl['DELETE_EXPIRED'] = PHPWS_Text::secureLink(dgettext('rolodex', 'Delete all expired members'), 'rolodex', array('aop'=>'delete_expired')); $tpl['ALL_COMMENTS_YES'] = PHPWS_Text::secureLink(dgettext('rolodex', 'Reset "Allow comments" on all records to yes'), 'rolodex', array('aop'=>'all_comments_yes')); --- 701,710 ---- $tpl['RESET_EXPIRED'] = PHPWS_Text::secureLink(sprintf(dgettext('rolodex', 'Reset all expiry dates to %s days from now'), PHPWS_Settings::get('rolodex', 'expiry_interval')), 'rolodex', array('aop'=>'reset_expired')); ! $vars['aop'] = 'delete_expired'; ! $js['ADDRESS'] = PHPWS_Text::linkAddress('rolodex', $vars, true); ! $js['QUESTION'] = dgettext('rolodex', 'Are you sure you want to delete all expired members?\nEach user\'s demographic information will be retained for other modules, but all Rolodex information will be permanently removed.'); ! $js['LINK'] = dgettext('rolodex', 'Delete all expired members'); ! $tpl['DELETE_EXPIRED'] = javascript('confirm', $js); ! $tpl['ALL_COMMENTS_YES'] = PHPWS_Text::secureLink(dgettext('rolodex', 'Reset "Allow comments" on all records to yes'), 'rolodex', array('aop'=>'all_comments_yes')); Index: Rolodex.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/Rolodex.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Rolodex.php 4 Feb 2008 04:16:21 -0000 1.2 --- Rolodex.php 8 Feb 2008 19:38:48 -0000 1.3 *************** *** 85,89 **** $this->forwardMessage(dgettext('rolodex', 'Member profile saved successfully.')); // PHPWS_Core::reroute('index.php?module=rolodex&aop=edit_member&user_id=' . $this->member->user_id); ! PHPWS_Core::reroute('index.php?module=rolodex&aop=menu&tab=list'); } } else { --- 85,90 ---- $this->forwardMessage(dgettext('rolodex', 'Member profile saved successfully.')); // PHPWS_Core::reroute('index.php?module=rolodex&aop=edit_member&user_id=' . $this->member->user_id); ! // PHPWS_Core::reroute('index.php?module=rolodex&aop=menu&tab=list'); ! PHPWS_Core::reroute('index.php?module=rolodex&id=' . $this->member->user_id); } } else { *************** *** 274,287 **** case 'submit_member': $this->loadForm('edit_my_member'); - // $this->loadForm('submit'); - // $this->title = $this->member->getDisplay_name(true); - // $this->content = $this->member->view(); break; case 'add_member': $this->loadForm('edit_my_member'); - // $this->loadForm('submit'); - // $this->title = $this->member->getDisplay_name(true); - // $this->content = $this->member->view(); break; --- 275,282 ---- *************** *** 306,314 **** if (PHPWS_Settings::get('rolodex', 'req_approval') && $this->member->isNew()) { $this->forwardMessage(dgettext('rolodex', 'Member profile submitted successfully. An admin will review.')); } else { $this->forwardMessage(dgettext('rolodex', 'Member profile saved successfully.')); } - // PHPWS_Core::reroute('index.php?module=rolodex&uop=edit_member&user_id=' . $this->member->user_id); - PHPWS_Core::reroute('index.php?module=rolodex&uop=list'); } } else { --- 301,309 ---- if (PHPWS_Settings::get('rolodex', 'req_approval') && $this->member->isNew()) { $this->forwardMessage(dgettext('rolodex', 'Member profile submitted successfully. An admin will review.')); + PHPWS_Core::reroute('index.php?module=rolodex&uop=list'); } else { $this->forwardMessage(dgettext('rolodex', 'Member profile saved successfully.')); + PHPWS_Core::reroute('index.php?module=rolodex&id=' . $this->member->user_id); } } } else { *************** *** 662,677 **** } - // isset($_POST['allow_comments']) ? - // $this->member->setAllow_comments(1) : - // $this->member->setAllow_comments(0); - - // isset($_POST['allow_anon']) ? - // $this->member->setAllow_anon(1) : - // $this->member->setAllow_anon(0); - - // isset($_POST['active']) ? - // $this->member->setActive(1) : - // $this->member->setActive(0); - if (Current_User::allow('rolodex', 'edit_member')) { if (isset($_POST['active'])) { --- 657,660 ---- *************** *** 801,805 **** } - // $this->member->setImage($image->getPath()); $this->member->setImage($img_array); } --- 784,787 ---- Index: RDX_Mypage.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Mypage.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** RDX_Mypage.php 4 Feb 2008 03:09:16 -0000 1.1.1.1 --- RDX_Mypage.php 8 Feb 2008 19:38:48 -0000 1.2 *************** *** 59,63 **** } ! function action(&$title, &$content) { --- 59,66 ---- } ! ! ! /* nothing below here used yet, maybe use in future */ ! function action(&$title, &$content) { Index: RDX_Member.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Member.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RDX_Member.php 4 Feb 2008 19:29:43 -0000 1.2 --- RDX_Member.php 8 Feb 2008 19:38:48 -0000 1.3 *************** *** 777,786 **** - // function setDate_expires($date_expires) - // { - // $this->date_expires = $date_expires; - // } - - function getDate_expires($print=false, $format=null) { --- 777,780 ---- |
