Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
54e1a6a817 | |||
9eacdcdc37 | |||
4388a4baa8 | |||
ed43b2f2df |
1
.gitignore
vendored
1
.gitignore
vendored
@ -62,3 +62,4 @@ logs/*
|
|||||||
mail.log
|
mail.log
|
||||||
vendor/canary/logs/*
|
vendor/canary/logs/*
|
||||||
docker/.env
|
docker/.env
|
||||||
|
.env
|
||||||
|
@ -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;
|
||||||
}
|
}
|
||||||
|
@ -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 );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -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' ],
|
||||||
|
12
composer.lock
generated
12
composer.lock
generated
@ -60,11 +60,11 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "thetempusproject/bedrock",
|
"name": "thetempusproject/bedrock",
|
||||||
"version": "1.0.5",
|
"version": "1.0.6",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.thetempusproject.com/the-tempus-project/bedrock",
|
"url": "https://git.thetempusproject.com/the-tempus-project/bedrock",
|
||||||
"reference": "79f21773c66a4b87e6a172cab3da23029c2441fd"
|
"reference": "7228e530b87a124d83fb46985829fd7308bb6173"
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=8.1.0",
|
"php": ">=8.1.0",
|
||||||
@ -101,7 +101,7 @@
|
|||||||
"framework",
|
"framework",
|
||||||
"mvc"
|
"mvc"
|
||||||
],
|
],
|
||||||
"time": "2024-08-09T21:18:24+00:00"
|
"time": "2024-08-13T05:16:12+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "thetempusproject/canary",
|
"name": "thetempusproject/canary",
|
||||||
@ -191,11 +191,11 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "thetempusproject/houdini",
|
"name": "thetempusproject/houdini",
|
||||||
"version": "1.0.6",
|
"version": "1.0.7",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.thetempusproject.com/the-tempus-project/houdini",
|
"url": "https://git.thetempusproject.com/the-tempus-project/houdini",
|
||||||
"reference": "168a9ee805a7ec9df222b77397e8cd8fb74f6cb1"
|
"reference": "4d2ccfb1c5f18dba9886405e7e6e2264e04e1f89"
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=8.1.0",
|
"php": ">=8.1.0",
|
||||||
@ -231,7 +231,7 @@
|
|||||||
"thetempusproject",
|
"thetempusproject",
|
||||||
"tools"
|
"tools"
|
||||||
],
|
],
|
||||||
"time": "2024-08-13T02:38:33+00:00"
|
"time": "2024-08-13T03:43:46+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "twbs/bootstrap",
|
"name": "twbs/bootstrap",
|
||||||
|
Reference in New Issue
Block a user