Commit c5f99909 authored by sluc23's avatar sluc23

Merge branch 'review' into '2.x'

Updates following extension review

See merge request !1
parents 8568a2b7 74675bf7
This diff is collapsed.
......@@ -3,21 +3,21 @@
<file>reportplus</file>
<name>Report Plus</name>
<description>Report Plus</description>
<license>propietary</license>
<license>AGPL-3.0</license>
<maintainer>
<author>iXiam Global Solutions</author>
<email>info@ixiam.com</email>
</maintainer>
<urls>
<url />
<url desc="Main Extension Page">https://lab.civicrm.org/extensions/reportplus</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2019-10-01</releaseDate>
<version>2.3.6</version>
<releaseDate>2019-10-18</releaseDate>
<version>2.3.7</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.16</ver>
</compatibility>
<comments>This is a new, undeveloped module</comments>
<civix>
<namespace>CRM/Reportplus</namespace>
</civix>
......
......@@ -19,7 +19,7 @@ msgstr ""
msgid "The Page"
msgstr "La página"
msgid "To add a column to resulset, click on and drag the field to <b>Selected Columns</b> box"
msgid "To add a column to resultset, click on and drag the field to <b>Selected Columns</b> box"
msgstr "Para añadir una columna al resultado, haga click y arrastre el campo a <b>Columnas Seleccionadas</b>"
msgid "Columns marked with an [X] are required and cannot be disposed"
......@@ -170,4 +170,4 @@ msgid "Birth Date (Month)"
msgstr "Fecha de nacimiento (Mes)"
msgid "Birth Date (Day)"
msgstr "Fecha de nacimiento (Día)"
\ No newline at end of file
msgstr "Fecha de nacimiento (Día)"
......@@ -19,7 +19,7 @@ msgstr ""
msgid "The Page"
msgstr "La página"
msgid "To add a column to resulset, click on and drag the field to <b>Selected Columns</b> box"
msgid "To add a column to resultset, click on and drag the field to <b>Selected Columns</b> box"
msgstr "Para añadir una columna al resultado, haga click y arrastre el campo a <b>Columnas Seleccionadas</b>"
msgid "Columns marked with an [X] are required and cannot be disposed"
......@@ -134,4 +134,4 @@ msgid "Unique Contacts"
msgstr "Contactos únicos"
msgid "Total Values"
msgstr "Valores totales"
\ No newline at end of file
msgstr "Valores totales"
......@@ -263,16 +263,17 @@ function _reportplus_civix_find_files($dir, $pattern) {
*/
function _reportplus_civix_civicrm_managed(&$entities) {
$mgdFiles = _reportplus_civix_find_files(__DIR__, '*.mgd.php');
sort($mgdFiles);
foreach ($mgdFiles as $file) {
$es = include $file;
foreach ($es as $e) {
if (empty($e['module'])) {
$e['module'] = E::LONG_NAME;
}
$entities[] = $e;
if (empty($e['params']['version'])) {
$e['params']['version'] = '3';
}
$entities[] = $e;
}
}
}
......@@ -352,8 +353,10 @@ function _reportplus_civix_glob($pattern) {
* Inserts a navigation menu item at a given place in the hierarchy.
*
* @param array $menu - menu hierarchy
* @param string $path - path where insertion should happen (ie. Administer/System Settings)
* @param array $item - menu you need to insert (parent/child attributes will be filled for you)
* @param string $path - path to parent of this item, e.g. 'my_extension/submenu'
* 'Mailing', or 'Administer/System Settings'
* @param array $item - the item to insert (parent/child attributes will be
* filled for you)
*/
function _reportplus_civix_insert_navigation_menu(&$menu, $path, $item) {
// If we are done going down the path, insert menu
......@@ -451,6 +454,8 @@ function _reportplus_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL
*
* @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_entityTypes
*/
function _reportplus_civix_civicrm_entityTypes(&$entityTypes) {
$entityTypes = array_merge($entityTypes, array());
$entityTypes = array_merge($entityTypes, array (
));
}
......@@ -198,7 +198,7 @@
<br/>
<div id="help" style="padding: 1em;">
{ts}To add a column to resulset, click on and drag the field to <b>Selected Columns</b> box{/ts}.<br/>
{ts}To add a column to resultset, click on and drag the field to <b>Selected Columns</b> box{/ts}.<br/>
{ts}Columns marked with an [X] are required and cannot be disposed{/ts}.<br/>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment