From 539f3bba598d430c76a99b16b796cfaf8fc01336 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Mon, 30 Sep 2002 02:15:23 +0000 Subject: [PATCH] All wobject collateral now moves using the moveCollateral method in the wobject superclass. --- lib/WebGUI/Wobject/DownloadManager.pm | 26 ++------------------------ lib/WebGUI/Wobject/FAQ.pm | 26 ++------------------------ lib/WebGUI/Wobject/LinkList.pm | 26 ++------------------------ lib/WebGUI/Wobject/MailForm.pm | 26 ++------------------------ 4 files changed, 8 insertions(+), 96 deletions(-) diff --git a/lib/WebGUI/Wobject/DownloadManager.pm b/lib/WebGUI/Wobject/DownloadManager.pm index a1a8ef719..7fbd58238 100644 --- a/lib/WebGUI/Wobject/DownloadManager.pm +++ b/lib/WebGUI/Wobject/DownloadManager.pm @@ -311,34 +311,12 @@ sub www_editDownloadSave { #------------------------------------------------------------------- sub www_moveDownloadDown { - my (@data, $thisSeq); - if (WebGUI::Privilege::canEditPage()) { - ($thisSeq) = WebGUI::SQL->quickArray("select sequenceNumber from DownloadManager_file where downloadId=$session{form}{did}"); - @data = WebGUI::SQL->quickArray("select downloadId from DownloadManager_file where wobjectId=$session{form}{wid} and sequenceNumber=$thisSeq+1 group by wobjectId"); - if ($data[0] ne "") { - WebGUI::SQL->write("update DownloadManager_file set sequenceNumber=sequenceNumber+1 where downloadId=$session{form}{did}"); - WebGUI::SQL->write("update DownloadManager_file set sequenceNumber=sequenceNumber-1 where downloadId=$data[0]"); - } - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + $_[0]->moveCollateralDown("DownloadManager_file","downloadId",$session{form}{did}); } #------------------------------------------------------------------- sub www_moveDownloadUp { - my (@data, $thisSeq); - if (WebGUI::Privilege::canEditPage()) { - ($thisSeq) = WebGUI::SQL->quickArray("select sequenceNumber from DownloadManager_file where downloadId=$session{form}{did}"); - @data = WebGUI::SQL->quickArray("select downloadId from DownloadManager_file where wobjectId=$session{form}{wid} and sequenceNumber=$thisSeq-1 group by wobjectId"); - if ($data[0] ne "") { - WebGUI::SQL->write("update DownloadManager_file set sequenceNumber=sequenceNumber-1 where downloadId=$session{form}{did}"); - WebGUI::SQL->write("update DownloadManager_file set sequenceNumber=sequenceNumber+1 where downloadId=$data[0]"); - } - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + $_[0]->moveCollateralUp("DownloadManager_file","downloadId",$session{form}{did}); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Wobject/FAQ.pm b/lib/WebGUI/Wobject/FAQ.pm index 5d135d3dd..e46fb5340 100644 --- a/lib/WebGUI/Wobject/FAQ.pm +++ b/lib/WebGUI/Wobject/FAQ.pm @@ -186,34 +186,12 @@ sub www_editQuestionSave { #------------------------------------------------------------------- sub www_moveQuestionDown { - my (@data, $thisSeq); - if (WebGUI::Privilege::canEditPage()) { - ($thisSeq) = WebGUI::SQL->quickArray("select sequenceNumber from FAQ_question where questionId=$session{form}{qid}"); - @data = WebGUI::SQL->quickArray("select questionId from FAQ_question where wobjectId=".$_[0]->get("wobjectId")." and sequenceNumber=$thisSeq+1 group by wobjectId"); - if ($data[0] ne "") { - WebGUI::SQL->write("update FAQ_question set sequenceNumber=sequenceNumber+1 where questionId=$session{form}{qid}"); - WebGUI::SQL->write("update FAQ_question set sequenceNumber=sequenceNumber-1 where questionId=$data[0]"); - } - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + $_[0]->moveCollateralDown("FAQ_question","questionId",$session{form}{qid}); } #------------------------------------------------------------------- sub www_moveQuestionUp { - my (@data, $thisSeq); - if (WebGUI::Privilege::canEditPage()) { - ($thisSeq) = WebGUI::SQL->quickArray("select sequenceNumber from FAQ_question where questionId=$session{form}{qid}"); - @data = WebGUI::SQL->quickArray("select questionId from FAQ_question where wobjectId=".$_[0]->get("wobjectId")." and sequenceNumber=$thisSeq-1 group by wobjectId"); - if ($data[0] ne "") { - WebGUI::SQL->write("update FAQ_question set sequenceNumber=sequenceNumber-1 where questionId=$session{form}{qid}"); - WebGUI::SQL->write("update FAQ_question set sequenceNumber=sequenceNumber+1 where questionId=$data[0]"); - } - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + $_[0]->moveCollateralUp("FAQ_question","questionId",$session{form}{qid}); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Wobject/LinkList.pm b/lib/WebGUI/Wobject/LinkList.pm index 7a98d253c..c629ced88 100644 --- a/lib/WebGUI/Wobject/LinkList.pm +++ b/lib/WebGUI/Wobject/LinkList.pm @@ -197,34 +197,12 @@ sub www_editLinkSave { #------------------------------------------------------------------- sub www_moveLinkDown { - my (@data, $thisSeq); - if (WebGUI::Privilege::canEditPage()) { - ($thisSeq) = WebGUI::SQL->quickArray("select sequenceNumber from LinkList_link where linkId=$session{form}{lid}"); - @data = WebGUI::SQL->quickArray("select linkId from LinkList_link where wobjectId=$session{form}{wid} and sequenceNumber=$thisSeq+1 group by wobjectId"); - if ($data[0] ne "") { - WebGUI::SQL->write("update LinkList_link set sequenceNumber=sequenceNumber+1 where linkId=$session{form}{lid}"); - WebGUI::SQL->write("update LinkList_link set sequenceNumber=sequenceNumber-1 where linkId=$data[0]"); - } - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + $_[0]->moveCollateralDown("LinkList_link","linkId",$session{form}{lid}); } #------------------------------------------------------------------- sub www_moveLinkUp { - my (@data, $thisSeq); - if (WebGUI::Privilege::canEditPage()) { - ($thisSeq) = WebGUI::SQL->quickArray("select sequenceNumber from LinkList_link where linkId=$session{form}{lid}"); - @data = WebGUI::SQL->quickArray("select linkId from LinkList_link where wobjectId=$session{form}{wid} and sequenceNumber=$thisSeq-1 group by wobjectId"); - if ($data[0] ne "") { - WebGUI::SQL->write("update LinkList_link set sequenceNumber=sequenceNumber-1 where linkId=$session{form}{lid}"); - WebGUI::SQL->write("update LinkList_link set sequenceNumber=sequenceNumber+1 where linkId=$data[0]"); - } - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + $_[0]->moveCollateralUp("LinkList_link","linkId",$session{form}{lid}); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Wobject/MailForm.pm b/lib/WebGUI/Wobject/MailForm.pm index 81f83d9ac..1544a603a 100755 --- a/lib/WebGUI/Wobject/MailForm.pm +++ b/lib/WebGUI/Wobject/MailForm.pm @@ -270,34 +270,12 @@ sub www_editFieldSave { #------------------------------------------------------------------- sub www_moveFieldDown { - my (@data, $thisSeq); - if (WebGUI::Privilege::canEditPage()) { - ($thisSeq) = WebGUI::SQL->quickArray("select sequenceNumber from MailForm_field where mailFieldId=$session{form}{fid}"); - @data = WebGUI::SQL->quickArray("select mailFieldId from MailForm_field where wobjectId=".$_[0]->get("wobjectId")." and sequenceNumber=$thisSeq+1 group by wobjectId"); - if ($data[0] ne "") { - WebGUI::SQL->write("update MailForm_field set sequenceNumber=sequenceNumber+1 where mailFieldId=$session{form}{fid}"); - WebGUI::SQL->write("update MailForm_field set sequenceNumber=sequenceNumber-1 where mailFieldId=$data[0]"); - } - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + $_[0]->moveCollateralDown("MailForm_field","mailFieldId",$session{form}{fid}); } #------------------------------------------------------------------- sub www_moveFieldUp { - my (@data, $thisSeq); - if (WebGUI::Privilege::canEditPage()) { - ($thisSeq) = WebGUI::SQL->quickArray("select sequenceNumber from MailForm_field where mailFieldId=$session{form}{fid}"); - @data = WebGUI::SQL->quickArray("select mailFieldId from MailForm_field where wobjectId=".$_[0]->get("wobjectId")." and sequenceNumber=$thisSeq-1 group by wobjectId"); - if ($data[0] ne "") { - WebGUI::SQL->write("update MailForm_field set sequenceNumber=sequenceNumber-1 where mailFieldId=$session{form}{fid}"); - WebGUI::SQL->write("update MailForm_field set sequenceNumber=sequenceNumber+1 where mailFieldId=$data[0]"); - } - return ""; - } else { - return WebGUI::Privilege::insufficient(); - } + $_[0]->moveCollateralUp("MailForm_field","mailFieldId",$session{form}{fid}); } #-------------------------------------------------------------------