-
Notifications
You must be signed in to change notification settings - Fork 443
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
System Settings Cleanup #2392
System Settings Cleanup #2392
Conversation
DawoudIO
commented
Apr 25, 2017
•
edited
Loading
edited
- removed checks for strang default values - closes System Settings: sToEmailAddress where is it used #2386
- changed iPersonNameStyle to drop down with values 1 to 6 - Closes iPersonNameStyle Admin setting needs to be a drop-down list #2133
- created a backup tab - closes System Settings: Backup tab #2390
- removed unused sXML_RPC_PATH - closes System Settings: sXML_RPC_PATH where is it used #2393
- created an Integration tab closes System Settings: Create an Integration Tab #2387
- iFYMonth is now a dropdown with 1 to 12 closes System Settings - iFYMonth should be a dropdown #2384
- added setting type password - closes System Settings - Passwords #2383
- fixed all vars to ensure they start with the correct prefix String -> s, Integer -> i, Boolean ->b , Array -> a closes System Settings: Members #2388
- removed sGeocoderID sGeocoderPW
- Name choices now has more info int he drop down
String -> s, Integer -> i, Boolean ->b , Array -> a
how about adding #1849 to this PR? |
I tried but it was bigger than you think as the system setting pages uses ids... So I revert it |
this is ready for testing |
once we merge a few more things to Master and merge them back to develop i have to dbl check a few items here |
@crossan007 I'm not sure why the tests are failing in the branch doing the testing via browser i see the pages |
@@ -1,7 +1,7 @@ | |||
<?php | |||
use ChurchCRM\dto\SystemConfig; | |||
|
|||
$googleTrackingID = SystemConfig::getValue('googleTrackingID'); | |||
$googleTrackingID = SystemConfig::getValue('sGoogleTrackingID'); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
see #2493
src/ChurchCRM/dto/ConfigItem.php
Outdated
private $id, $name, $value, $type, $default, $tooltip, $data, $dbConfigItem; | ||
public function __construct($id, $name, $type, $default, $tooltip, $data='') { | ||
private $id, $name, $value, $type, $default, $tooltip, $url, $data, $dbConfigItem; | ||
public function __construct($id, $name, $type, $default, $tooltip, $url='', $data='') { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm unclear on what you are showing me
@@ -186,6 +186,12 @@ | |||
value='<?= htmlspecialchars($setting->getValue(), ENT_QUOTES) ?>' class="form-control"> | |||
<?php | |||
|
|||
} elseif ($setting->getType() == 'password') { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You missed sISTpassword
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a few changes - fix the URL setting parameter order / count and the sISTPassword field
We need to merge this soon as it will be a merge nightmare merge |
Can you fix the issue I commented on for multi-valued settings using the value-choices of that setting as the link? that's the only thing needed to merge this. |
ok sISTpassword updated let me know if you see other stuff needing changes |
The "link URL" that appears when you hover over the link for the setting does not contain a valid address- instead it shows the choices available for that multiple choice selection |
this is now good to go... i tested the URLs and make a few more changes but I'll merge this after it pass the checks |
src/SystemSettings.php
Outdated
@@ -247,7 +247,7 @@ class="form-control"> | |||
} | |||
if (!empty($setting->getUrl())) { | |||
?> | |||
<a href="<?= $setting->getUrl() ?>"><i class="fa fa-fw fa-link"></i></a> | |||
<a href="<?= $setting->getUrl() ?>" target="_blank"><i class="fa fa-fw fa-link"></i></a> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1