Skip to content
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

Merged
merged 22 commits into from
May 20, 2017
Merged

System Settings Cleanup #2392

merged 22 commits into from
May 20, 2017

Conversation

DawoudIO
Copy link
Contributor

@DawoudIO DawoudIO commented Apr 25, 2017

@ghost ghost assigned DawoudIO Apr 25, 2017
@ghost ghost added the In Review label Apr 25, 2017
@DawoudIO DawoudIO added this to the 2.8.0 milestone Apr 25, 2017
@crossan007
Copy link
Contributor

how about adding #1849 to this PR?

@DawoudIO
Copy link
Contributor Author

I tried but it was bigger than you think as the system setting pages uses ids... So I revert it

@DawoudIO
Copy link
Contributor Author

this is ready for testing

@DawoudIO
Copy link
Contributor Author

once we merge a few more things to Master and merge them back to develop i have to dbl check a few items here

@DawoudIO
Copy link
Contributor Author

DawoudIO commented May 6, 2017

@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');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see #2493

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='') {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like this, but it needs more work.

there are some config settings which provide incorrect values for this parameter:

image

Copy link
Contributor Author

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') {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You missed sISTpassword

Copy link
Contributor

@crossan007 crossan007 left a 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

@DawoudIO
Copy link
Contributor Author

We need to merge this soon as it will be a merge nightmare merge

@crossan007
Copy link
Contributor

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.

@DawoudIO
Copy link
Contributor Author

ok sISTpassword updated let me know if you see other stuff needing changes

@crossan007
Copy link
Contributor

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

@DawoudIO
Copy link
Contributor Author

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

@@ -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>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@DawoudIO DawoudIO merged commit 827d7d1 into develop May 20, 2017
@ghost ghost removed bug In Review labels May 20, 2017
@DawoudIO DawoudIO deleted the system-settings-cleanup branch May 20, 2017 20:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants