Changeset 663

Timestamp:

10/15/09 12:43:58 (3 years ago)

Author:

nate

Message:

• Changed schdulers class name to scheduler (now matches the table name).
• Added code to inactivate scheduler records via the search screen.
• Removed a table option for the scheduler table that did not have a matching function in scheduler.php.

Location:

trunk/phpbms

Files:

• install/tableoptions.sql (modified) (1 diff)
• install/updatev0.98.sql (modified) (1 diff)
• modules/base/include/scheduler.php (modified) (2 diffs)
• modules/base/scheduler_addedit.php (modified) (1 diff)

trunk/phpbms/install/tableoptions.sql

@@ -49 +49 @@
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('tbld:83de284b-ef79-3567-145c-30ca38b40796', 'edit', '1', '1', '0', '', '0');
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('tbld:83de284b-ef79-3567-145c-30ca38b40796', 'inactivate', 'inactivate', '1', '1', '', '0');
-INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('tbld:83de284b-ef79-3567-145c-30ca38b40796', 'runSelected', 'run job(s)', '1', '1', '', '0');
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('tbld:83de284b-ef79-3567-145c-30ca38b40796', 'import', '0', '0', '0', 'Admin', '0');
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('tbld:87b9fe06-afe5-d9c6-0fa0-4a0f2ec4ee8a', 'new', '1', '0', '0', '', '0');

trunk/phpbms/install/updatev0.98.sql

@@ -451 +451 @@
 INSERT INTO `tablegroupings` (`tabledefid`, `field`, `displayorder`, `ascending`, `name`, `roleid`) VALUES ('tbld:83187e3d-101e-a8a5-037f-31e9800fed2d', 'if(menu.parentid=\'\' OR menu.parentid IS NULL,concat( lpad(menu.displayorder,3,\"0\"), \" - \" ,menu.name ) , concat( lpad(parentmenu.displayorder,3,\"0\") , \" - \",parentmenu.name))', '1', '1', '', '');
 --end tablegroupings INSERT--
+--tableoptions DELETE--
+DELETE FROM `tableoptions` WHERE `name` = 'runSelected' AND `tabledefid` = '201' AND `option` = 'run job(s)';
+--end tableoptions DELETE--
 --tableoptions INSERT--
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `needselect`, `othercommand`, `roleid`, `displayorder`) VALUES ('tbld:0fcca651-6c34-c74d-ac04-2d88f602dd71', 'import', '0', '0', '0', 'Admin', '0');

trunk/phpbms/modules/base/include/scheduler.php

@@ -38 +38 @@
 */
 if(class_exists("phpbmsTable")){
-        class schedulers extends phpbmsTable{
+        class scheduler extends phpbmsTable{
 
                 function getDefaults(){
@@ -169 +169 @@
         }//end class
 }//end if
+
+if(class_exists("searchFunctions")){
+        class schedulerSearchFunctions extends searchFunctions{
+                
+                function inactivate($useUUID = false){
+                        
+                        if(!$useUUID)
+                                $whereclause = $this->buildWhereClause();
+                        else
+                                $whereclause = $this->buildWhereClause($this->maintable.".uuid");
+                                
+                        $updatestatement = "
+                                UPDATE
+                                        `scheduler`
+                                SET
+                                        `inactive` = '1'
+                                WHERE
+                                        ".$whereclause."
+                        ";
+                        
+                        $updateresult = $this->db->query($updatestatement);
+                        
+                        $message = $this->buildStatusMessage();
+                        $message.=" inactivated";
+                        return $message;
+                        
+                }//end function
+                
+        }//end class
+}//end if
 ?>

trunk/phpbms/modules/base/scheduler_addedit.php

@@ -43 +43 @@
         include("include/scheduler.php");
 
-        $thetable = new schedulers($db,"tbld:83de284b-ef79-3567-145c-30ca38b40796");
+        $thetable = new scheduler($db,"tbld:83de284b-ef79-3567-145c-30ca38b40796");
         $therecord = $thetable->processAddEditPage();