joomla/Component-Builder
39
25
Fork 11
Code Issues 76 Pull Requests Projects 4 Wiki Activity

Added field filtering to admin fields conditions to only load fields linked to admin view. Updated the component export method to also export the new views and field relationships

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2017-10-16 19:14:23 +02:00
parent c2972c3e17
commit 6c29a6fca1
320 changed files with 1231 additions and 742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/models/forms/admin_fields.js
View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 22 of this MVC
@build 13th October, 2017
@build 15th October, 2017
@created 12th October, 2017
@package Component Builder
@subpackage admin_fields.js

2
admin/models/forms/admin_fields_conditions.js
View File

@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 15 of this MVC
@build 13th October, 2017
@build 16th October, 2017
@created 12th October, 2017
@package Component Builder
@subpackage admin_fields_conditions.js

8
admin/models/forms/admin_fields_conditions.xml
View File

@ -106,9 +106,9 @@
icon="list"
maximum="500">
<form hidden="true" name="list_addconditions_modal" repeat="true">
<!-- Target_field Field. Type: Fieldsmulti. (custom) -->
<!-- Target_field Field. Type: Targetfields. (custom) -->
<field
type="fieldsmulti"
type="targetfields"
name="target_field"
label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_FIELD_LABEL"
description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_FIELD_DESCRIPTION"
@ -151,9 +151,9 @@
<option value="1">
COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_CHAIN</option>
</field>
<!-- Match_field Field. Type: Fields. (custom) -->
<!-- Match_field Field. Type: Matchfield. (custom) -->
<field
type="fields"
type="matchfield"
name="match_field"
label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MATCH_FIELD_LABEL"
description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MATCH_FIELD_DESCRIPTION"

27
admin/models/forms/admin_view.js
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 185 of this MVC
@build 14th October, 2017
@version @update number 191 of this MVC
@build 16th October, 2017
@created 30th April, 2015
@package Component Builder
@subpackage admin_view.js
@ -1187,6 +1187,8 @@ jQuery(document).ready(function()
getFieldsDisplay('admin_fields_conditions');
// set button
addButtonID('admin_fields_conditions','create_edit_buttons', 1); // <-- second
// set button to add more languages
addButton('field','create_edit_buttons'); // <-- third
});
function getFieldsDisplay(type){
@ -1241,6 +1243,27 @@ function addButtonID(type, where, size){
}
});
}
function addButton_server(type){
var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&vdm="+vastDevMod);
if(token.length > 0 && type.length > 0){
var request = 'token='+token+'&type='+type;
}
return jQuery.ajax({
type: 'GET',
url: getUrl,
dataType: 'jsonp',
data: request,
jsonp: 'callback'
});
}
function addButton(type,where){
addButton_server(type).done(function(result) {
if(result){
addData(result,'#jform_'+where);
}
})
}
function getTableColumns_server(tableName){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.tableColumns&format=json";

4
admin/models/forms/joomla_component.js
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 389 of this MVC
@build 14th October, 2017
@version @update number 412 of this MVC
@build 16th October, 2017
@created 6th May, 2015
@package Component Builder
@subpackage joomla_component.js

19
admin/models/forms/language_translation.js
View File

@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 44 of this MVC
@build 12th October, 2017
@version @update number 45 of this MVC
@build 14th October, 2017
@created 3rd April, 2017
@package Component Builder
@subpackage language_translation.js
@ -29,6 +29,10 @@ jQuery(document).ready(function($)
// set button to add more languages
addButton('language','components');
});
function addData(result,where){
jQuery(where).closest('.control-group').parent().append(result);
}
function addButton_server(type){
var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&vdm="+vastDevMod);
if(token.length > 0 && type.length > 0){
@ -42,13 +46,10 @@ function addButton_server(type){
jsonp: 'callback'
});
}
function addButton(type, where){
function addButton(type,where){
addButton_server(type).done(function(result) {
if(result){
setButton(result, '#jform_'+where);
addData(result,'#jform_'+where);
}
});
}
function setButton(result, where){
jQuery(where).closest('.control-group').append(result);
}
})
}