From 3cec02c4c7d522b676d8b03b07fa6364fb297391 Mon Sep 17 00:00:00 2001 From: Taras Machyshyn Date: Wed, 6 Nov 2013 13:31:09 +0200 Subject: [PATCH] systemConfig changes --- application/Espo/Core/systemConfig.php | 6 +++ .../Espo/Layouts/customTest/detailTest.json | 1 - .../Espo/Layouts/customTest/detailView.json | 1 - .../Espo/Metadata/entityDefs/Attachment.json | 0 .../Espo/Metadata/entityDefs/Comment.json | 0 .../Metadata/entityDefs/EmailTemplate.json | 0 .../Espo/Metadata/entityDefs/Preferences.json | 0 .../Espo/Metadata/entityDefs/Role.json | 0 .../Espo/Metadata/entityDefs/Settings.json | 0 .../Espo/Metadata/entityDefs/Team.json | 0 .../Espo/Metadata/entityDefs/User.json | 0 .../Espo/Utils/Controllers/Controller.php | 0 application/Espo/Utils/Controllers/Layout.php | 0 .../Espo/Utils/Controllers/Manager.php | 0 .../Crm/Layouts/contact/filtersAdvanced.json | 0 .../Crm/Layouts/lead/filtersAdvanced.json | 0 .../Layouts/opportunity/filtersAdvanced.json | 0 .../Modules/Crm/Layouts/task/list.json | 0 .../Modules/Crm/Layouts/task/listSmall.json | 0 .../Crm/Metadata/entityDefs/Account.json | 0 .../Modules/Crm/Metadata/entityDefs/Call.json | 0 .../Modules/Crm/Metadata/entityDefs/Case.json | 0 .../Crm/Metadata/entityDefs/Contact.json | 0 .../Crm/Metadata/entityDefs/Email.json | 0 .../Crm/Metadata/entityDefs/InboundEmail.json | 0 .../Modules/Crm/Metadata/entityDefs/Lead.json | 0 .../Crm/Metadata/entityDefs/Meeting.json | 0 .../Crm/Metadata/entityDefs/Opportunity.json | 0 .../Crm/Metadata/entityDefs/Prospect.json | 0 .../Modules/Crm/Metadata/entityDefs/Task.json | 0 application/config.php | 0 data/cache/application/metadata.php | 42 +++++++++++++++---- tests/myfile.txt | 0 33 files changed, 41 insertions(+), 9 deletions(-) delete mode 100755 application/Espo/Layouts/customTest/detailTest.json delete mode 100755 application/Espo/Layouts/customTest/detailView.json mode change 100644 => 100755 application/Espo/Metadata/entityDefs/Attachment.json mode change 100644 => 100755 application/Espo/Metadata/entityDefs/Comment.json mode change 100644 => 100755 application/Espo/Metadata/entityDefs/EmailTemplate.json mode change 100644 => 100755 application/Espo/Metadata/entityDefs/Preferences.json mode change 100644 => 100755 application/Espo/Metadata/entityDefs/Role.json mode change 100644 => 100755 application/Espo/Metadata/entityDefs/Settings.json mode change 100644 => 100755 application/Espo/Metadata/entityDefs/Team.json mode change 100644 => 100755 application/Espo/Metadata/entityDefs/User.json mode change 100644 => 100755 application/Espo/Utils/Controllers/Controller.php mode change 100644 => 100755 application/Espo/Utils/Controllers/Layout.php mode change 100644 => 100755 application/Espo/Utils/Controllers/Manager.php mode change 100644 => 100755 application/Modules/Crm/Layouts/contact/filtersAdvanced.json mode change 100644 => 100755 application/Modules/Crm/Layouts/lead/filtersAdvanced.json mode change 100644 => 100755 application/Modules/Crm/Layouts/opportunity/filtersAdvanced.json mode change 100644 => 100755 application/Modules/Crm/Layouts/task/list.json mode change 100644 => 100755 application/Modules/Crm/Layouts/task/listSmall.json mode change 100644 => 100755 application/Modules/Crm/Metadata/entityDefs/Account.json mode change 100644 => 100755 application/Modules/Crm/Metadata/entityDefs/Call.json mode change 100644 => 100755 application/Modules/Crm/Metadata/entityDefs/Case.json mode change 100644 => 100755 application/Modules/Crm/Metadata/entityDefs/Contact.json mode change 100644 => 100755 application/Modules/Crm/Metadata/entityDefs/Email.json mode change 100644 => 100755 application/Modules/Crm/Metadata/entityDefs/InboundEmail.json mode change 100644 => 100755 application/Modules/Crm/Metadata/entityDefs/Lead.json mode change 100644 => 100755 application/Modules/Crm/Metadata/entityDefs/Meeting.json mode change 100644 => 100755 application/Modules/Crm/Metadata/entityDefs/Opportunity.json mode change 100644 => 100755 application/Modules/Crm/Metadata/entityDefs/Prospect.json mode change 100644 => 100755 application/Modules/Crm/Metadata/entityDefs/Task.json mode change 100644 => 100755 application/config.php mode change 100644 => 100755 data/cache/application/metadata.php mode change 100644 => 100755 tests/myfile.txt diff --git a/application/Espo/Core/systemConfig.php b/application/Espo/Core/systemConfig.php index 226b6b109c..05897de879 100755 --- a/application/Espo/Core/systemConfig.php +++ b/application/Espo/Core/systemConfig.php @@ -71,6 +71,12 @@ return array ( 'configPathFull', 'configCustomPathFull', 'crud', + 'customDir', + 'espoPath', + 'espoModulePath', + 'espoCustomPath', + 'controllerPath', + 'scopeModuleMap', ), 'adminItems' => array ( diff --git a/application/Espo/Layouts/customTest/detailTest.json b/application/Espo/Layouts/customTest/detailTest.json deleted file mode 100755 index 66830c1a9a..0000000000 --- a/application/Espo/Layouts/customTest/detailTest.json +++ /dev/null @@ -1 +0,0 @@ -[{"label":"MyLabel"}] \ No newline at end of file diff --git a/application/Espo/Layouts/customTest/detailView.json b/application/Espo/Layouts/customTest/detailView.json deleted file mode 100755 index 723be25c6e..0000000000 --- a/application/Espo/Layouts/customTest/detailView.json +++ /dev/null @@ -1 +0,0 @@ -[{"oldlabel":"MyLabeldddd","label":"MyLabel"}] \ No newline at end of file diff --git a/application/Espo/Metadata/entityDefs/Attachment.json b/application/Espo/Metadata/entityDefs/Attachment.json old mode 100644 new mode 100755 diff --git a/application/Espo/Metadata/entityDefs/Comment.json b/application/Espo/Metadata/entityDefs/Comment.json old mode 100644 new mode 100755 diff --git a/application/Espo/Metadata/entityDefs/EmailTemplate.json b/application/Espo/Metadata/entityDefs/EmailTemplate.json old mode 100644 new mode 100755 diff --git a/application/Espo/Metadata/entityDefs/Preferences.json b/application/Espo/Metadata/entityDefs/Preferences.json old mode 100644 new mode 100755 diff --git a/application/Espo/Metadata/entityDefs/Role.json b/application/Espo/Metadata/entityDefs/Role.json old mode 100644 new mode 100755 diff --git a/application/Espo/Metadata/entityDefs/Settings.json b/application/Espo/Metadata/entityDefs/Settings.json old mode 100644 new mode 100755 diff --git a/application/Espo/Metadata/entityDefs/Team.json b/application/Espo/Metadata/entityDefs/Team.json old mode 100644 new mode 100755 diff --git a/application/Espo/Metadata/entityDefs/User.json b/application/Espo/Metadata/entityDefs/User.json old mode 100644 new mode 100755 diff --git a/application/Espo/Utils/Controllers/Controller.php b/application/Espo/Utils/Controllers/Controller.php old mode 100644 new mode 100755 diff --git a/application/Espo/Utils/Controllers/Layout.php b/application/Espo/Utils/Controllers/Layout.php old mode 100644 new mode 100755 diff --git a/application/Espo/Utils/Controllers/Manager.php b/application/Espo/Utils/Controllers/Manager.php old mode 100644 new mode 100755 diff --git a/application/Modules/Crm/Layouts/contact/filtersAdvanced.json b/application/Modules/Crm/Layouts/contact/filtersAdvanced.json old mode 100644 new mode 100755 diff --git a/application/Modules/Crm/Layouts/lead/filtersAdvanced.json b/application/Modules/Crm/Layouts/lead/filtersAdvanced.json old mode 100644 new mode 100755 diff --git a/application/Modules/Crm/Layouts/opportunity/filtersAdvanced.json b/application/Modules/Crm/Layouts/opportunity/filtersAdvanced.json old mode 100644 new mode 100755 diff --git a/application/Modules/Crm/Layouts/task/list.json b/application/Modules/Crm/Layouts/task/list.json old mode 100644 new mode 100755 diff --git a/application/Modules/Crm/Layouts/task/listSmall.json b/application/Modules/Crm/Layouts/task/listSmall.json old mode 100644 new mode 100755 diff --git a/application/Modules/Crm/Metadata/entityDefs/Account.json b/application/Modules/Crm/Metadata/entityDefs/Account.json old mode 100644 new mode 100755 diff --git a/application/Modules/Crm/Metadata/entityDefs/Call.json b/application/Modules/Crm/Metadata/entityDefs/Call.json old mode 100644 new mode 100755 diff --git a/application/Modules/Crm/Metadata/entityDefs/Case.json b/application/Modules/Crm/Metadata/entityDefs/Case.json old mode 100644 new mode 100755 diff --git a/application/Modules/Crm/Metadata/entityDefs/Contact.json b/application/Modules/Crm/Metadata/entityDefs/Contact.json old mode 100644 new mode 100755 diff --git a/application/Modules/Crm/Metadata/entityDefs/Email.json b/application/Modules/Crm/Metadata/entityDefs/Email.json old mode 100644 new mode 100755 diff --git a/application/Modules/Crm/Metadata/entityDefs/InboundEmail.json b/application/Modules/Crm/Metadata/entityDefs/InboundEmail.json old mode 100644 new mode 100755 diff --git a/application/Modules/Crm/Metadata/entityDefs/Lead.json b/application/Modules/Crm/Metadata/entityDefs/Lead.json old mode 100644 new mode 100755 diff --git a/application/Modules/Crm/Metadata/entityDefs/Meeting.json b/application/Modules/Crm/Metadata/entityDefs/Meeting.json old mode 100644 new mode 100755 diff --git a/application/Modules/Crm/Metadata/entityDefs/Opportunity.json b/application/Modules/Crm/Metadata/entityDefs/Opportunity.json old mode 100644 new mode 100755 diff --git a/application/Modules/Crm/Metadata/entityDefs/Prospect.json b/application/Modules/Crm/Metadata/entityDefs/Prospect.json old mode 100644 new mode 100755 diff --git a/application/Modules/Crm/Metadata/entityDefs/Task.json b/application/Modules/Crm/Metadata/entityDefs/Task.json old mode 100644 new mode 100755 diff --git a/application/config.php b/application/config.php old mode 100644 new mode 100755 diff --git a/data/cache/application/metadata.php b/data/cache/application/metadata.php old mode 100644 new mode 100755 index 3c92ecad70..a5d7ff256b --- a/data/cache/application/metadata.php +++ b/data/cache/application/metadata.php @@ -495,11 +495,11 @@ return array ( ), 'weekStart' => array ( - 'type' => 'enum', + 'type' => 'enumInt', 'options' => array ( - 0 => '0', - 1 => '1', + 0 => 0, + 1 => 1, ), 'default' => 0, ), @@ -611,13 +611,13 @@ return array ( ), 'weekStart' => array ( - 'type' => 'enum', + 'type' => 'enumInt', 'options' => array ( - 0 => '0', - 1 => '1', + 0 => 0, + 1 => 1, ), - 'default' => '1', + 'default' => 0, ), 'thousandSeparator' => array ( @@ -716,6 +716,7 @@ return array ( 8 => 'Case', 9 => 'Prospect', ), + 'translation' => 'App.scopeNamesPlural', ), 'quickCreateList' => array ( @@ -732,6 +733,7 @@ return array ( 7 => 'Case', 8 => 'Prospect', ), + 'translation' => 'App.scopeNames', ), ), ), @@ -3064,6 +3066,32 @@ return array ( 'advanced' => true, ), ), + 'enumInt' => + array ( + 'params' => + array ( + 0 => + array ( + 'name' => 'options', + 'type' => 'array', + ), + 1 => + array ( + 'name' => 'default', + 'type' => 'varchar', + ), + 2 => + array ( + 'name' => 'translation', + 'type' => 'varchar', + ), + ), + 'search' => + array ( + 'basic' => false, + 'advanced' => true, + ), + ), 'float' => array ( 'params' => diff --git a/tests/myfile.txt b/tests/myfile.txt old mode 100644 new mode 100755