the-tempus-project/thetempusproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

various bugfixes

Browse Source
This commit is contained in:
Joey Kimsey
2024-08-13 01:19:05 -04:00
parent ed43b2f2df
commit 4388a4baa8
4 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/classes/installer.php
View File

@ -266,6 +266,7 @@ class Installer {
} }
public function getModelInfo( $filename, $folder = '' ) { public function getModelInfo( $filename, $folder = '' ) {
Debug::debug( 'getModelInfo filename: ' . $filename . ', folder: ' . $folder);
$object = self::emptyModule( 'model', $folder, $filename ); $object = self::emptyModule( 'model', $folder, $filename );
if ( ! class_exists( $object->class ) ) { if ( ! class_exists( $object->class ) ) {
@ -363,7 +364,7 @@ class Installer {
return false; return false;
} }
$errors[] = [ 'errorInfo' => $module_data['name'] . " has been installed." ]; $errors[] = [ 'errorInfo' => $module_data['name'] . " Plugin has been installed." ];
self::$errors = array_merge( self::$errors, $errors ); self::$errors = array_merge( self::$errors, $errors );
return true; return true;
} }
@ -393,7 +394,7 @@ class Installer {
} }
$this->removeModule( $module_data->name, true ); $this->removeModule( $module_data->name, true );
$errors[] = [ 'errorInfo' => $module_data->name . " has been installed." ]; $errors[] = [ 'errorInfo' => $module_data->name . " Plugin has been uninstalled." ];
self::$errors = array_merge( self::$errors, $errors ); self::$errors = array_merge( self::$errors, $errors );
return true; return true;
} }
@ -438,7 +439,7 @@ class Installer {
// exclude any flags we don't have a matric map for // exclude any flags we don't have a matric map for
if ( empty( $module_data->class_object->$matrix ) ) { if ( empty( $module_data->class_object->$matrix ) ) {
Debug::warn( "$flag_type does not have a proper matrix map and cannot be installed." ); Debug::warn( "$flag_type does not have a proper matrix map and cannot be uninstalled." );
$module_data->$flag_type = INSTALL_STATUS_NOT_FOUND; $module_data->$flag_type = INSTALL_STATUS_NOT_FOUND;
} }
} }
@ -465,7 +466,7 @@ class Installer {
return false; return false;
} }
$errors[] = [ 'errorInfo' => $module_data['name'] . " has been installed." ]; $errors[] = [ 'errorInfo' => $module_data['name'] . " model has been installed." ];
self::$errors = array_merge( self::$errors, $errors ); self::$errors = array_merge( self::$errors, $errors );
return true; return true;
} }
@ -512,7 +513,7 @@ class Installer {
return false; return false;
} }
$errors[] = [ 'errorInfo' => $module_data->name . " has been uninstalled." ]; $errors[] = [ 'errorInfo' => $module_data->name . " model has been uninstalled." ];
self::$errors = array_merge( self::$errors, $errors ); self::$errors = array_merge( self::$errors, $errors );
return true; return true;
} }

12
app/plugins/bookmarks/plugin.php
View File

@ -32,10 +32,6 @@ class Bookmarks extends Plugin {
'pretty' => 'Can use the bookmarks feature', 'pretty' => 'Can use the bookmarks feature',
'default' => false, 'default' => false,
], ],
'createEvents' => [
'pretty' => 'Can add events to bookmarks',
'default' => false,
],
]; ];
public $main_links = [ public $main_links = [
[ [
@ -51,12 +47,4 @@ class Bookmarks extends Plugin {
'default' => true, 'default' => true,
], ],
]; ];
public $bookmarks;
public $folders;
public function __construct( $load = false ) {
$this->bookmarks = new Bookmark;
$this->folders = new Folders;
parent::__construct( $load );
}
} }

2
app/plugins/initiativetracker/models/inithistory.php
View File

@ -22,7 +22,7 @@ use TheTempusProject\Plugins\Feedback as Plugin;
use TheTempusProject\TheTempusProject as App; use TheTempusProject\TheTempusProject as App;
class Inithistory extends DatabaseModel { class Inithistory extends DatabaseModel {
public $tableName = 'feedback'; public $tableName = 'initiative_history';
public $databaseMatrix = [ public $databaseMatrix = [
[ 'name', 'varchar', '128' ], [ 'name', 'varchar', '128' ],
[ 'time', 'int', '10' ], [ 'time', 'int', '10' ],