Skip to content

1277: fixed throwable and wrapButtonSettings function call #1278

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Dec 28, 2022
Merged

1277: fixed throwable and wrapButtonSettings function call #1278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resources/fileTemplates/internal/Magento Form Button Block Class.php.ft
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class ${NAME} extends ${GENERIC_BUTTON} implements ${DATA_PROVIDER_TYPE}

#end
return $this->wrapButtonSettings(
__('${LABEL}'),
__('${LABEL}')->getText(),
'${CLASS}',
${ON_CLICK},
${DATA_ATTRS},
Expand Down
11 changes: 2 additions & 9 deletions src/com/magento/idea/magento2plugin/stubs/indexes/PluginIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import com.intellij.util.io.DataExternalizer;
import com.intellij.util.io.EnumeratorStringDescriptor;
import com.intellij.util.io.KeyDescriptor;
import com.jetbrains.php.PhpIndex;
import com.jetbrains.php.lang.PhpLangUtil;
import com.magento.idea.magento2plugin.magento.files.ModuleDiXml;
import com.magento.idea.magento2plugin.project.Settings;
Expand Down Expand Up @@ -91,7 +90,6 @@ public Map<String, Set<PluginData>> map(final @NotNull FileContent fileContent)

@SuppressWarnings("checkstyle:LineLength")
private Set<PluginData> getPluginsForType(final XmlTag typeNode) {
final PhpIndex phpIndex = PhpIndex.getInstance(typeNode.getProject());
final Set<PluginData> results = new HashSet<>();

for (final XmlTag pluginTag: typeNode.findSubTags(ModuleDiXml.PLUGIN_TAG_NAME)) {
Expand All @@ -100,12 +98,7 @@ private Set<PluginData> getPluginsForType(final XmlTag typeNode) {

if (pluginType != null && !pluginType.isEmpty()) {
final PluginData pluginData = getPluginDataObject(pluginType, getIntegerOrZeroValue(pluginSortOrder));
try {
phpIndex.getAnyByFQN(pluginData.getType());
results.add(pluginData);
} catch (Throwable exception) { //NOPMD
//do nothing
}
results.add(pluginData);
}
}

Expand All @@ -128,7 +121,7 @@ private PluginData getPluginDataObject(
final String pluginType,
final Integer sortOrder
) {
return new PluginData(pluginType, sortOrder);
return new PluginData(pluginType, sortOrder);
}
};
}
Expand Down
2 changes: 1 addition & 1 deletion ...ns/generation/generator/FormButtonBlockGenerator/generateBackButtonBlock/MyBackButton.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class MyBackButton extends GenericButton implements ButtonProviderInterface
public function getButtonData(): array
{
return $this->wrapButtonSettings(
__('Back To Grid'),
__('Back To Grid')->getText(),
'back',
sprintf("location.href = '%s';", $this->getUrl('*/*/')),
[],
Expand Down
2 changes: 1 addition & 1 deletion ...ions/generation/generator/FormButtonBlockGenerator/generateCustomButtonBlock/MyCustom.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class MyCustom extends GenericButton implements ButtonProviderInterface
public function getButtonData(): array
{
return $this->wrapButtonSettings(
__('Custom Button'),
__('Custom Button')->getText(),
'custom',
'',
[],
Expand Down
2 changes: 1 addition & 1 deletion ...s/generation/generator/FormButtonBlockGenerator/generateDeleteButtonBlock/DeleteBlock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public function getButtonData(): array
}

return $this->wrapButtonSettings(
__('Delete'),
__('Delete')->getText(),
'delete',
sprintf("deleteConfirm('%s', '%s')",
__('Are you sure you want to delete this book?'),
Expand Down
2 changes: 1 addition & 1 deletion ...tions/generation/generator/FormButtonBlockGenerator/generateSaveButtonBlock/SaveBlock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class SaveBlock extends GenericButton implements ButtonProviderInterface
public function getButtonData(): array
{
return $this->wrapButtonSettings(
__('Save'),
__('Save')->getText(),
'save primary',
'',
[
Expand Down