Skip to content

Commit 2f8a700

Browse files
mfleesonmfleeson
authored
Merge pull request #30 from mfleeson/Extensions-and-General-Fixes
Extensions and general fixes
2 parents 5145aea + 6d50a08 commit 2f8a700

File tree

426 files changed

+65416
-20574
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

426 files changed

+65416
-20574
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@
1212
component/backend/vendor
1313
## JoRobo config file
1414
jorobo.ini
15+
/cc/

‎composer.lock‎

Lines changed: 919 additions & 207 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/administrator/components/com_jed/access.xml‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<access component="com_jed">
3-
<section name="component">
4-
<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN"/>
5-
<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE"/>
6-
<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE"/>
7-
<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE"/>
8-
<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT"/>
9-
<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE"/>
10-
<action name="core.edit.own" title="JACTION_EDITOWN" description="JACTION_EDITOWN"/>
11-
</section>
12-
<section name="category">
13-
<action name="core.create" title="JACTION_CREATE" description="COM_CATEGORIES_ACCESS_CREATE_DESC"/>
14-
<action name="core.delete" title="JACTION_DELETE" description="COM_CATEGORIES_ACCESS_DELETE_DESC"/>
15-
<action name="core.edit" title="JACTION_EDIT" description="COM_CATEGORIES_ACCESS_EDIT_DESC"/>
16-
<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_CATEGORIES_ACCESS_EDITSTATE_DESC"/>
17-
<action name="core.edit.own" title="JACTION_EDITOWN" description="COM_CATEGORIES_ACCESS_EDITOWN_DESC"/>
18-
</section>
19-
<section name="jedticket">
20-
<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE"/>
21-
<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE"/>
22-
<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT"/>
23-
<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE"/>
24-
<action name="core.edit.own" title="JACTION_EDITOWN" description="JACTION_EDITOWN"/>
25-
</section>
26-
<section name="temp">
27-
<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE"/>
28-
<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE"/>
29-
<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT"/>
30-
<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE"/>
31-
<action name="core.edit.own" title="JACTION_EDITOWN" description="JACTION_EDITOWN"/>
32-
</section>
33-
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<access component="com_jed">
3+
<section name="component">
4+
<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN"/>
5+
<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE"/>
6+
<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE"/>
7+
<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE"/>
8+
<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT"/>
9+
<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE"/>
10+
<action name="core.edit.own" title="JACTION_EDITOWN" description="JACTION_EDITOWN"/>
11+
</section>
12+
<section name="category">
13+
<action name="core.create" title="JACTION_CREATE" description="COM_CATEGORIES_ACCESS_CREATE_DESC"/>
14+
<action name="core.delete" title="JACTION_DELETE" description="COM_CATEGORIES_ACCESS_DELETE_DESC"/>
15+
<action name="core.edit" title="JACTION_EDIT" description="COM_CATEGORIES_ACCESS_EDIT_DESC"/>
16+
<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_CATEGORIES_ACCESS_EDITSTATE_DESC"/>
17+
<action name="core.edit.own" title="JACTION_EDITOWN" description="COM_CATEGORIES_ACCESS_EDITOWN_DESC"/>
18+
</section>
19+
<section name="ticket">
20+
<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE"/>
21+
<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE"/>
22+
<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT"/>
23+
<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE"/>
24+
<action name="core.edit.own" title="JACTION_EDITOWN" description="JACTION_EDITOWN"/>
25+
</section>
26+
<section name="temp">
27+
<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE"/>
28+
<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE"/>
29+
<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT"/>
30+
<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE"/>
31+
<action name="core.edit.own" title="JACTION_EDITOWN" description="JACTION_EDITOWN"/>
32+
</section>
33+
3434
</access>

‎src/administrator/components/com_jed/config.xml‎

Lines changed: 102 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,102 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<config>
3-
<fieldset label="COM_JED3_CONFIGURATION" name="jed">
4-
<field name="jed3_db_host" filter="safehtml" type="text" default="localhost" label="COM_JED_MIGRATE_JED3_DB_HOST_LABEL" description="COM_JED_MIGRATE_JED3_DB_HOST_DESCR" hint="COM_JED_MIGRATE_JED3_DB_HOST_LABEL"/>
5-
<field name="jed3_db_user" filter="safehtml" type="text" label="COM_JED_MIGRATE_JED3_DB_USER_LABEL" description="COM_JED_MIGRATE_JED3_DB_USER_DESCR" hint="COM_JED_MIGRATE_JED3_DB_USER_LABEL"/>
6-
<field name="jed3_db_password" filter="safehtml" type="text" label="COM_JED_MIGRATE_JED3_DB_PASSWORD_LABEL" description="COM_JED_MIGRATE_JED3_DB_PASSWORD_DESCR" hint="COM_JED_MIGRATE_JED3_DB_PASSWORD_LABEL"/>
7-
<field name="jed3_db_database_name" filter="safehtml" type="text" default="bl_j3_mar22" label="COM_JED_MIGRATE_JED3_DB_NAME_LABEL" description="COM_JED_MIGRATE_JED3_DB_NAME_DESCR" hint="COM_JED_MIGRATE_JED3_DB_NAME_LABEL"/>
8-
<field name="jed3_db_prefix" filter="safehtml" type="text" default="wqyh6" label="COM_JED_MIGRATE_JED3_DB_PREFIX_LABEL" description="COM_JED_MIGRATE_JED3_DB_PREFIX_DESCR" hint="COM_JED_MIGRATE_JED3_DB_PREFIX_LABEL"/>
9-
</fieldset>
10-
<fieldset name="component" label="JGLOBAL_FIELDSET_INTEGRATION">
11-
<field
12-
name="save_history"
13-
type="radio"
14-
default="0"
15-
label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
16-
description="JGLOBAL_SAVE_HISTORY_OPTIONS_DESC"
17-
layout="joomla.form.field.radio.switcher"
18-
>
19-
<option value="0">JNO</option>
20-
<option value="1">JYES</option>
21-
</field>
22-
23-
<field name="history_limit" type="text" filter="integer" label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL" description="JGLOBAL_HISTORY_LIMIT_OPTIONS_DESC" default="5"/>
24-
</fieldset>
25-
<fieldset name="permissions" description="JCONFIG_PERMISSIONS_DESC" label="JCONFIG_PERMISSIONS_LABEL">
26-
<field name="rules" type="rules" component="com_jed" class="inputbox" filter="rules" validate="rules" label="JCONFIG_PERMISSIONS_LABEL" section="component" />
27-
</fieldset>
28-
</config>
29-
<!--
30-
########################################################################################
31-
The following are a list of all the different types of fields you can add to this file
32-
They are here for copy pasting - neat eh?
33-
########################################################################################
34-
35-
https://docs.joomla.org/Standard_form_field_types
36-
<field name="mycalendar" type="calendar" default="5-10-2008" label="Select a date" description="" format="%d-%m-%Y" />
37-
38-
https://docs.joomla.org/Standard_form_field_types
39-
<field name="mycategory" type="category" label="Select a category" description="" section="3" />
40-
41-
https://docs.joomla.org/Standard_form_field_types
42-
<field name="myeditor" type="editors" default="none" label="Select an editor" />
43-
44-
https://docs.joomla.org/Standard_form_field_types
45-
<field name="myfile" type="filelist" default="" label="Select a file" description="" directory="administrator" filter="" exclude="" stripext="" />
46-
47-
https://docs.joomla.org/Standard_form_field_types
48-
<field name="myfolder" type="folderlist" default="" label="Select a folder" directory="administrator" filter="" exclude="" stripext="" />
49-
50-
https://docs.joomla.org/Standard_form_field_types
51-
<field name="myhelpsite" type="helpsites" default="" label="Select a help site" description="" />
52-
53-
https://docs.joomla.org/Standard_form_field_types
54-
<field name="mysecretvariable" type="hidden" default="" />
55-
56-
https://docs.joomla.org/Standard_form_field_types
57-
<field name="myimage" type="imagelist" default="" label="Select an image" description="" directory="" exclude="" stripext="" />
58-
59-
https://docs.joomla.org/Standard_form_field_types
60-
<field name="mylanguage" type="languages" client="site" default="en-GB" label="Select a language" description="" />
61-
62-
https://docs.joomla.org/Standard_form_field_types
63-
<field name="mylistvalue" type="list" default="" label="Select an option" description="">
64-
<option value="0">Option 1</option>
65-
<option value="1">Option 2</option>
66-
</field>
67-
68-
https://docs.joomla.org/Standard_form_field_types
69-
<field name="mymenu" type="menu" default="mainmenu" label="Select a menu" description="Select a menu" />
70-
71-
https://docs.joomla.org/Standard_form_field_types
72-
<field name="mymenuitem" type="menuitem" default="45" label="Select a menu item" description="Select a menu item" />
73-
74-
https://docs.joomla.org/Standard_form_field_types
75-
<field name="mypassword" type="password" default="secret" label="Enter a password" description="" size="5" />
76-
77-
https://docs.joomla.org/Standard_form_field_types
78-
<field name="myradiovalue" type="radio" default="0" label="Select an option" description="">
79-
<option value="0">1</option>
80-
<option value="1">2</option>
81-
</field>
82-
83-
https://docs.joomla.org/Standard_form_field_types
84-
<field type="spacer" default="&lt;b&gt;Advanced parameters&lt;/b&gt;" />
85-
86-
https://docs.joomla.org/Standard_form_field_types
87-
<field name="myfield" type="sql" default="10" label="Select an article" query="SELECT id, title FROM #__content" key_field=”id” value_field=”title” />
88-
89-
https://docs.joomla.org/Standard_form_field_types
90-
<field name="mytextvalue" type="text" default="Some text" label="Enter some text" description="" size="10" />
91-
92-
https://docs.joomla.org/Standard_form_field_types
93-
<field name="mytextarea" type="textarea" default="default" label="Enter some text" description="" rows="10" cols="5" />
94-
95-
https://docs.joomla.org/Standard_form_field_types
96-
<field name="mytimezone" type="timezones" default="-10" label="Select a timezone" description="" />
97-
98-
https://docs.joomla.org/Standard_form_field_types
99-
<field name="myusergroups" type="usergroup" default="" label="Select a user group" description="" />
100-
101-
102-
-->
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<config>
3+
<fieldset label="COM_JED_JED3_CONFIGURATION" name="jed">
4+
<field name="jed3_db_host" filter="safehtml" type="text" default="localhost" label="COM_JED_MIGRATE_JED3_DB_HOST_LABEL" description="COM_JED_MIGRATE_JED3_DB_HOST_DESCR" hint="COM_JED_MIGRATE_JED3_DB_HOST_LABEL"/>
5+
<field name="jed3_db_user" filter="safehtml" type="text" label="COM_JED_MIGRATE_JED3_DB_USER_LABEL" description="COM_JED_MIGRATE_JED3_DB_USER_DESCR" hint="COM_JED_MIGRATE_JED3_DB_USER_LABEL"/>
6+
<field name="jed3_db_password" filter="safehtml" type="text" label="COM_JED_MIGRATE_JED3_DB_PASSWORD_LABEL" description="COM_JED_MIGRATE_JED3_DB_PASSWORD_DESCR" hint="COM_JED_MIGRATE_JED3_DB_PASSWORD_LABEL"/>
7+
<field name="jed3_db_database_name" filter="safehtml" type="text" default="bl_j3_mar22" label="COM_JED_MIGRATE_JED3_DB_NAME_LABEL" description="COM_JED_MIGRATE_JED3_DB_NAME_DESCR" hint="COM_JED_MIGRATE_JED3_DB_NAME_LABEL"/>
8+
<field name="jed3_db_prefix" filter="safehtml" type="text" default="wqyh6" label="COM_JED_MIGRATE_JED3_DB_PREFIX_LABEL" description="COM_JED_MIGRATE_JED3_DB_PREFIX_DESCR" hint="COM_JED_MIGRATE_JED3_DB_PREFIX_LABEL"/>
9+
</fieldset>
10+
<fieldset name="component" label="JGLOBAL_FIELDSET_INTEGRATION">
11+
<field
12+
name="save_history"
13+
type="radio"
14+
default="0"
15+
label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
16+
description="JGLOBAL_SAVE_HISTORY_OPTIONS_DESC"
17+
layout="joomla.form.field.radio.switcher"
18+
>
19+
<option value="0">JNO</option>
20+
<option value="1">JYES</option>
21+
</field>
22+
23+
<field name="history_limit" type="text" filter="integer" label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL" description="JGLOBAL_HISTORY_LIMIT_OPTIONS_DESC" default="5"/>
24+
</fieldset>
25+
<fieldset name="permissions" description="JCONFIG_PERMISSIONS_DESC" label="JCONFIG_PERMISSIONS_LABEL">
26+
<field name="rules" type="rules" component="com_jed" class="inputbox" filter="rules" validate="rules" label="JCONFIG_PERMISSIONS_LABEL" section="component" />
27+
</fieldset>
28+
</config>
29+
<!--
30+
########################################################################################
31+
The following are a list of all the different types of fields you can add to this file
32+
They are here for copy pasting - neat eh?
33+
########################################################################################
34+
35+
https://docs.joomla.org/Standard_form_field_types
36+
<field name="mycalendar" type="calendar" default="5-10-2008" label="Select a date" description="" format="%d-%m-%Y" />
37+
38+
https://docs.joomla.org/Standard_form_field_types
39+
<field name="mycategory" type="category" label="Select a category" description="" section="3" />
40+
41+
https://docs.joomla.org/Standard_form_field_types
42+
<field name="myeditor" type="editors" default="none" label="Select an editor" />
43+
44+
https://docs.joomla.org/Standard_form_field_types
45+
<field name="myfile" type="filelist" default="" label="Select a file" description="" directory="administrator" filter="" exclude="" stripext="" />
46+
47+
https://docs.joomla.org/Standard_form_field_types
48+
<field name="myfolder" type="folderlist" default="" label="Select a folder" directory="administrator" filter="" exclude="" stripext="" />
49+
50+
https://docs.joomla.org/Standard_form_field_types
51+
<field name="myhelpsite" type="helpsites" default="" label="Select a help site" description="" />
52+
53+
https://docs.joomla.org/Standard_form_field_types
54+
<field name="mysecretvariable" type="hidden" default="" />
55+
56+
https://docs.joomla.org/Standard_form_field_types
57+
<field name="myimage" type="imagelist" default="" label="Select an image" description="" directory="" exclude="" stripext="" />
58+
59+
https://docs.joomla.org/Standard_form_field_types
60+
<field name="mylanguage" type="languages" client="site" default="en-GB" label="Select a language" description="" />
61+
62+
https://docs.joomla.org/Standard_form_field_types
63+
<field name="mylistvalue" type="list" default="" label="Select an option" description="">
64+
<option value="0">Option 1</option>
65+
<option value="1">Option 2</option>
66+
</field>
67+
68+
https://docs.joomla.org/Standard_form_field_types
69+
<field name="mymenu" type="menu" default="mainmenu" label="Select a menu" description="Select a menu" />
70+
71+
https://docs.joomla.org/Standard_form_field_types
72+
<field name="mymenuitem" type="menuitem" default="45" label="Select a menu item" description="Select a menu item" />
73+
74+
https://docs.joomla.org/Standard_form_field_types
75+
<field name="mypassword" type="password" default="secret" label="Enter a password" description="" size="5" />
76+
77+
https://docs.joomla.org/Standard_form_field_types
78+
<field name="myradiovalue" type="radio" default="0" label="Select an option" description="">
79+
<option value="0">1</option>
80+
<option value="1">2</option>
81+
</field>
82+
83+
https://docs.joomla.org/Standard_form_field_types
84+
<field type="spacer" default="&lt;b&gt;Advanced parameters&lt;/b&gt;" />
85+
86+
https://docs.joomla.org/Standard_form_field_types
87+
<field name="myfield" type="sql" default="10" label="Select an article" query="SELECT id, title FROM #__content" key_field=”id” value_field=”title” />
88+
89+
https://docs.joomla.org/Standard_form_field_types
90+
<field name="mytextvalue" type="text" default="Some text" label="Enter some text" description="" size="10" />
91+
92+
https://docs.joomla.org/Standard_form_field_types
93+
<field name="mytextarea" type="textarea" default="default" label="Enter some text" description="" rows="10" cols="5" />
94+
95+
https://docs.joomla.org/Standard_form_field_types
96+
<field name="mytimezone" type="timezones" default="-10" label="Select a timezone" description="" />
97+
98+
https://docs.joomla.org/Standard_form_field_types
99+
<field name="myusergroups" type="usergroup" default="" label="Select a user group" description="" />
100+
101+
102+
-->

‎src/administrator/components/com_jed/forms/copyjed3data.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<form addfieldprefix="Jed\Component\Jed\Administrator\Field">
3-
</form>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<form addfieldprefix="Jed\Component\Jed\Administrator\Field">
3+
</form>

0 commit comments

Comments
 (0)