mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-17 20:11:46 +02:00
Code Issues Releases Wiki Activity

Update Modules/ProcessModules to skip showing configurable modules with no visible configuration fields. Plus a few other small additions.

Browse Source
This commit is contained in:
Ryan Cramer
2016-10-20 06:58:28 -04:00
parent 4a26b774bf
commit 4060934bae
18 changed files with 267 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wire/modules/Inputfield/InputfieldSelector/InputfieldSelector.module
View File

@@ -63,6 +63,7 @@ class InputfieldSelector extends Inputfield implements ConfigurableModule {
'summary' => 'Build a page finding selector visually.',
'author' => 'Avoine + ProcessWire',
'autoload' => "template=admin",
'addFlag' => Modules::flagsNoUserConfig
);
}

3
wire/modules/LanguageSupport/LanguageSupport.module
View File

@@ -32,7 +32,8 @@ class LanguageSupport extends WireData implements Module, ConfigurableModule {
'installs' => array(
'ProcessLanguage',
'ProcessLanguageTranslator',
)
),
'addFlag' => Modules::flagsNoUserConfig
);
}

1
wire/modules/Process/ProcessField/ProcessField.module
View File

@@ -26,6 +26,7 @@ class ProcessField extends Process implements ConfigurableModule {
'permission' => 'field-admin', // add this permission if you want this Process available for roles other than Superuser
'icon' => 'cube',
'useNavJSON' => true,
'addFlag' => Modules::flagsNoUserConfig
);
}

4
wire/modules/Process/ProcessModule/ProcessModule.js
View File

@@ -21,10 +21,10 @@ $(document).ready(function() {
$("button.ProcessModuleSettings").click(function() {
var $a = $(this).parents('tr').find('.ConfigurableModule').parent('a');
window.location.href = $a.attr('href');
window.location.href = $a.attr('href') + '&collapse_info=1';
});
if($('#modules_form').size() > 0) {
if($('#modules_form').length > 0) {
$('#modules_form').WireTabs({
items: $(".Inputfields li.WireTab"),
rememberTabs: true

2
wire/modules/Process/ProcessModule/ProcessModule.min.js vendored
View File

@@ -1 +1 @@
$(document).ready(function(){$(".not_installed").parent("a").css("opacity",0.6).click(function(){var b=$(this).children(".not_installed").attr("data-name");var d=$(".install_"+b+":visible");var c=d.attr("disabled");if(d.size()){d.effect("highlight",1000)}else{var a=$(this).css("color");$(this).closest("tr").find(".requires").attr("data-color",$(this).css("color")).css("color",a).effect("highlight",1000)}return false});$("button.ProcessModuleSettings").click(function(){var a=$(this).parents("tr").find(".ConfigurableModule").parent("a");window.location.href=a.attr("href")});if($("#modules_form").size()>0){$("#modules_form").WireTabs({items:$(".Inputfields li.WireTab"),rememberTabs:true})}$("select.modules_section_select").change(function(){var b=$(this).val();var a=$(this).parent("p").siblings(".modules_section");if(b==""){a.show()}else{a.hide();a.filter(".modules_"+b).show()}document.cookie=$(this).attr("name")+"="+b;return true}).change();$(document).on("click","#head_button a",function(){document.cookie="WireTabs=tab_new_modules";return true});$("#Inputfield_new_seconds").change(function(){$(this).parents("form").submit()});$("#wrap_upload_module").removeClass("InputfieldItemList")});
$(document).ready(function(){$(".not_installed").parent("a").css("opacity",0.6).click(function(){var b=$(this).children(".not_installed").attr("data-name");var d=$(".install_"+b+":visible");var c=d.attr("disabled");if(d.size()){d.effect("highlight",1000)}else{var a=$(this).css("color");$(this).closest("tr").find(".requires").attr("data-color",$(this).css("color")).css("color",a).effect("highlight",1000)}return false});$("button.ProcessModuleSettings").click(function(){var a=$(this).parents("tr").find(".ConfigurableModule").parent("a");window.location.href=a.attr("href")+"&collapse_info=1"});if($("#modules_form").length>0){$("#modules_form").WireTabs({items:$(".Inputfields li.WireTab"),rememberTabs:true})}$("select.modules_section_select").change(function(){var b=$(this).val();var a=$(this).parent("p").siblings(".modules_section");if(b==""){a.show()}else{a.hide();a.filter(".modules_"+b).show()}document.cookie=$(this).attr("name")+"="+b;return true}).change();$(document).on("click","#head_button a",function(){document.cookie="WireTabs=tab_new_modules";return true});$("#Inputfield_new_seconds").change(function(){$(this).parents("form").submit()});$("#wrap_upload_module").removeClass("InputfieldItemList")});

35
wire/modules/Process/ProcessModule/ProcessModule.module
View File

@@ -188,10 +188,18 @@ class ProcessModule extends Process {
sort($moduleNames);
foreach($moduleNames as $moduleName) {
$info = $this->wire('modules')->getModuleInfoVerbose($moduleName);
if($site && $info['core']) continue;
if($core && !$info['core']) continue;
if($configurable && (!$info['configurable'] || !$info['installed'])) continue;
if($configurable) {
if(!$info['configurable'] || !$info['installed']) continue;
$flags = $this->wire('modules')->getFlags($moduleName);
if($flags & Modules::flagsNoUserConfig) continue;
}
if($install) {
// exclude already installed modules
if($info['installed']) continue;
@@ -206,6 +214,7 @@ class ProcessModule extends Process {
$url = $install ? "installConfirm" : "edit";
$url .= "?name=$info[name]";
if($configurable) $url .= "&collapse_info=1";
$data['list'][$_label] = array(
'url' => $url,
@@ -366,7 +375,12 @@ class ProcessModule extends Process {
$siteModulesArray[$name] = $installed;
}
if($info['configurable'] && $info['installed']) $configurableArray[$name] = $installed;
if($info['configurable'] && $info['installed']) {
$flags = $this->modules->getFlags($name);
if(!($flags & Modules::flagsNoUserConfig)) {
$configurableArray[$name] = $installed;
}
}
}
$form = $this->modules->get('InputfieldForm');
@@ -713,10 +727,12 @@ class ProcessModule extends Process {
$editUrl = '#';
} else if($configurable) {
$buttons .=
"<button type='button' class='ProcessModuleSettings ui-state-default ui-button'>" .
"<span class='ui-button-text'><i class='fa fa-cog'></i> " . $this->_x('Settings', 'button') . "</span></button>"; // Text for 'Settings' button
$flags = $this->modules->getFlags($name);
if(!($flags & Modules::flagsNoUserConfig)) {
$buttons .=
"<button type='button' class='ProcessModuleSettings ui-state-default ui-button'>" .
"<span class='ui-button-text'><i class='fa fa-cog'></i> " . $this->_x('Settings', 'button') . "</span></button>"; // Text for 'Settings' button
}
}
if($buttons) $buttons = "<small class='buttons'>$buttons</small>";
@@ -1132,7 +1148,11 @@ class ProcessModule extends Process {
$out = '';
$moduleId = $this->modules->getModuleID($moduleName);
$languages = $this->wire('languages');
$collapseInfo = $this->wire('input')->get('collapse_info') || $this->wire('input')->get('modal') ? '&collapse_info=1': '';
$submitSave = $this->input->post('submit_save_module');
$collapseInfo = '';
if($submitSave || $this->wire('input')->get('collapse_info') || $this->wire('input')->get('modal')) {
$collapseInfo = '&collapse_info=1';
}
if(!$moduleId) {
$this->error("Unknown module");
return $this->session->redirect('./');
@@ -1254,7 +1274,6 @@ class ProcessModule extends Process {
}
// check for submitted form
$submitSave = $this->input->post('submit_save_module');
if($submitSave) {
if(is_null($data)) $data = $this->modules->getModuleConfigData($moduleName);

3
wire/modules/Process/ProcessPageLister/ProcessPageLister.info.json
View File

@@ -10,5 +10,6 @@
"permissions": {
"page-lister": "Use Page Lister"
},
"useNavJSON": true
"useNavJSON": true,
"addFlag": 32
}

1
wire/modules/Process/ProcessPageType/ProcessPageType.module
View File

@@ -22,6 +22,7 @@ class ProcessPageType extends Process implements ConfigurableModule, WirePageEdi
'summary' => __('List, Edit and Add pages of a specific type', __FILE__), // getModuleInfo summary
'permanent' => true,
'useNavJSON' => true,
'addFlag' => Modules::flagsNoUserConfig
);
}

2
wire/modules/Process/ProcessTemplate/ProcessTemplate.js
View File

@@ -152,7 +152,7 @@ $(document).ready(function() {
// instantiate the WireTabs
var $templateEdit = $("#ProcessTemplateEdit");
if($templateEdit.size() > 0) {
if($templateEdit.length > 0) {
$templateEdit.find('script').remove();
$templateEdit.WireTabs({
items: $(".Inputfields li.WireTab"),

2
wire/modules/Process/ProcessTemplate/ProcessTemplate.min.js vendored
View File

@@ -1 +1 @@
$(document).ready(function(){$("#wrap_filter_system input").click(function(){$(this).parents("form").submit()});$("#filter_field").change(function(){$(this).parents("form").submit()});var a=function(){if($("#redirectLogin_-1:checked").size()>0){$("#wrap_redirectLoginURL").slideDown()}else{$("#wrap_redirectLoginURL").hide()}};var f=function(){var g=["#wrap_redirectLogin","#wrap_guestSearchable"];if($("#roles_37").is(":checked")){$("#wrap_redirectLoginURL").hide();$(g).each(function(i,j){var h=$(j);if(h.is(".InputfieldStateCollapsed")){h.hide()}else{h.slideUp()}});$("input.viewRoles").attr("checked","checked")}else{$(g).each(function(i,j){var h=$(j);if(h.is(":visible")){return}h.slideDown("fast",function(){if(!h.is(".InputfieldStateCollapsed")){return}h.find(".InputfieldStateToggle").click()})});a()}};$("#wrap_useRoles input").click(function(){if($("#useRoles_1:checked").size()>0){$("#wrap_redirectLogin").hide();$("#wrap_guestSearchable").hide();$("#useRolesYes").slideDown();$("#wrap_useRoles > label").click();$("input.viewRoles").attr("checked","checked")}else{$("#useRolesYes").slideUp();$("#accessOverrides:visible").slideUp()}});if($("#useRoles_0:checked").size()>0){$("#useRolesYes").hide();$("#accessOverrides").hide()}$("#roles_37").click(f);$("input.viewRoles:not(#roles_37)").click(function(){var g=$(this);if($("#roles_37").is(":checked")){return false}return true});var d=function(){var h=$("#roles_editor input.editRoles");var g=0;h.each(function(){var j=$(this);if(j.is(":disabled")){return false}var i=$("input.createRoles[value="+j.attr("value")+"]");if(j.is(":checked")){g++;i.removeAttr("disabled")}else{i.removeAttr("checked").attr("disabled","disabled")}});if(g){$("#accessOverrides").slideDown()}else{$("#accessOverrides").hide()}return true};var e=function(){var g=0;$("#roles_editor input.editRoles").each(function(){if(!$(this).is(":disabled")&&$(this).is(":checked")){g++}});$("#roles_editor input.addRoles").each(function(){if(!$(this).is(":disabled")&&$(this).is(":checked")){g++}});g>0?$("#wrap_noInherit").slideDown():$("#wrap_noInherit").hide()};$("#roles_editor input.editRoles").click(d);$("#roles_editor input.editRoles, #roles_editor input.addRoles").click(e);d();e();$("#wrap_redirectLogin input").click(a);var c=function(){$ol=$("#fieldgroup_fields").prev("ol.asmList");$ol.find("span.asmFieldsetIndent").remove();$ol.children("li").children("span.asmListItemLabel").children("a:contains('_END')").each(function(){var h=$(this).text();if(h.substring(h.length-4)!="_END"){return}h=h.substring(0,h.length-4);var j=$(this).parents("li.asmListItem");j.addClass("asmFieldset asmFieldsetEnd");while(1){j=j.prev("li.asmListItem");if(j.size()<1){break}var g=j.children("span.asmListItemLabel");var i=g.text();if(i==h){j.addClass("asmFieldset asmFieldsetStart");break}g.prepend($('<span class="asmFieldsetIndent"></span>'))}})};$("#fieldgroup_fields").change(c).bind("init",c);f();a();var b=$("#ProcessTemplateEdit");if(b.size()>0){b.find("script").remove();b.WireTabs({items:$(".Inputfields li.WireTab"),id:"TemplateEditTabs",skipRememberTabIDs:["WireTabDelete"]})}$("#export_data").click(function(){$(this).select()});$(".import_toggle input[type=radio]").change(function(){var g=$(this).parents("p.import_toggle").next("table");var h=$(this).closest(".InputfieldFieldset");if($(this).is(":checked")&&$(this).val()==0){g.hide();h.addClass("ui-priority-secondary")}else{g.show();h.removeClass("ui-priority-secondary")}}).change();$("#import_form table td:not(:first-child)").each(function(){var g=$(this).html();var h=false;if(g.substring(0,1)=="{"){g="<pre>"+g+"</pre>";g=g.replace(/<br>/g,"");h=true}if(h){$(this).html(g)}});$("#fieldgroup_fields").change(function(){$("#_fieldgroup_fields_changed").val("changed")})});
$(document).ready(function(){$("#wrap_filter_system input").click(function(){$(this).parents("form").submit()});$("#filter_field").change(function(){$(this).parents("form").submit()});var a=function(){if($("#redirectLogin_-1:checked").size()>0){$("#wrap_redirectLoginURL").slideDown()}else{$("#wrap_redirectLoginURL").hide()}};var f=function(){var g=["#wrap_redirectLogin","#wrap_guestSearchable"];if($("#roles_37").is(":checked")){$("#wrap_redirectLoginURL").hide();$(g).each(function(i,j){var h=$(j);if(h.is(".InputfieldStateCollapsed")){h.hide()}else{h.slideUp()}});$("input.viewRoles").attr("checked","checked")}else{$(g).each(function(i,j){var h=$(j);if(h.is(":visible")){return}h.slideDown("fast",function(){if(!h.is(".InputfieldStateCollapsed")){return}h.find(".InputfieldStateToggle").click()})});a()}};$("#wrap_useRoles input").click(function(){if($("#useRoles_1:checked").size()>0){$("#wrap_redirectLogin").hide();$("#wrap_guestSearchable").hide();$("#useRolesYes").slideDown();$("#wrap_useRoles > label").click();$("input.viewRoles").attr("checked","checked")}else{$("#useRolesYes").slideUp();$("#accessOverrides:visible").slideUp()}});if($("#useRoles_0:checked").size()>0){$("#useRolesYes").hide();$("#accessOverrides").hide()}$("#roles_37").click(f);$("input.viewRoles:not(#roles_37)").click(function(){var g=$(this);if($("#roles_37").is(":checked")){return false}return true});var d=function(){var h=$("#roles_editor input.editRoles");var g=0;h.each(function(){var j=$(this);if(j.is(":disabled")){return false}var i=$("input.createRoles[value="+j.attr("value")+"]");if(j.is(":checked")){g++;i.removeAttr("disabled")}else{i.removeAttr("checked").attr("disabled","disabled")}});if(g){$("#accessOverrides").slideDown()}else{$("#accessOverrides").hide()}return true};var e=function(){var g=0;$("#roles_editor input.editRoles").each(function(){if(!$(this).is(":disabled")&&$(this).is(":checked")){g++}});$("#roles_editor input.addRoles").each(function(){if(!$(this).is(":disabled")&&$(this).is(":checked")){g++}});g>0?$("#wrap_noInherit").slideDown():$("#wrap_noInherit").hide()};$("#roles_editor input.editRoles").click(d);$("#roles_editor input.editRoles, #roles_editor input.addRoles").click(e);d();e();$("#wrap_redirectLogin input").click(a);var c=function(){$ol=$("#fieldgroup_fields").prev("ol.asmList");$ol.find("span.asmFieldsetIndent").remove();$ol.children("li").children("span.asmListItemLabel").children("a:contains('_END')").each(function(){var h=$(this).text();if(h.substring(h.length-4)!="_END"){return}h=h.substring(0,h.length-4);var j=$(this).parents("li.asmListItem");j.addClass("asmFieldset asmFieldsetEnd");while(1){j=j.prev("li.asmListItem");if(j.size()<1){break}var g=j.children("span.asmListItemLabel");var i=g.text();if(i==h){j.addClass("asmFieldset asmFieldsetStart");break}g.prepend($('<span class="asmFieldsetIndent"></span>'))}})};$("#fieldgroup_fields").change(c).bind("init",c);f();a();var b=$("#ProcessTemplateEdit");if(b.length>0){b.find("script").remove();b.WireTabs({items:$(".Inputfields li.WireTab"),id:"TemplateEditTabs",skipRememberTabIDs:["WireTabDelete"]})}$("#export_data").click(function(){$(this).select()});$(".import_toggle input[type=radio]").change(function(){var g=$(this).parents("p.import_toggle").next("table");var h=$(this).closest(".InputfieldFieldset");if($(this).is(":checked")&&$(this).val()==0){g.hide();h.addClass("ui-priority-secondary")}else{g.show();h.removeClass("ui-priority-secondary")}}).change();$("#import_form table td:not(:first-child)").each(function(){var g=$(this).html();var h=false;if(g.substring(0,1)=="{"){g="<pre>"+g+"</pre>";g=g.replace(/<br>/g,"");h=true}if(h){$(this).html(g)}});$("#fieldgroup_fields").change(function(){$("#_fieldgroup_fields_changed").val("changed")})});