diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/newui/ListPluginComponent.java b/platform/platform-impl/src/com/intellij/ide/plugins/newui/ListPluginComponent.java index 9a317bda8994..afe519a04cfd 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/newui/ListPluginComponent.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/newui/ListPluginComponent.java @@ -89,7 +89,7 @@ public class ListPluginComponent extends JPanel { myPluginModel = pluginModel; mySearchListener = searchListener; myMarketplace = marketplace; - myIsAllowed = PluginManagerConfigurableForOrg.getInstance().isPluginAllowed(plugin); + myIsAllowed = PluginManagerConfigurableForOrg.getInstance().isPluginAllowed(!marketplace, plugin); pluginModel.addComponent(this); setOpaque(true); diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginDetailsPageComponent.java b/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginDetailsPageComponent.java index fedb207c5303..6c77f2d27581 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginDetailsPageComponent.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginDetailsPageComponent.java @@ -526,8 +526,8 @@ public class PluginDetailsPageComponent extends MultiPanel { public void showPluginImpl(@NotNull IdeaPluginDescriptor pluginDescriptor, @Nullable IdeaPluginDescriptor updateDescriptor) { myPlugin = pluginDescriptor; PluginManagerConfigurableForOrg org = PluginManagerConfigurableForOrg.getInstance(); - myUpdateDescriptor = updateDescriptor != null && org.isPluginAllowed(updateDescriptor) ? updateDescriptor : null; - myIsPluginAllowed = org.isPluginAllowed(pluginDescriptor); + myUpdateDescriptor = updateDescriptor != null && org.isPluginAllowed(!myMarketplace, updateDescriptor) ? updateDescriptor : null; + myIsPluginAllowed = org.isPluginAllowed(!myMarketplace, pluginDescriptor); showPlugin(); select(0, true); } diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/org/PluginManagerConfigurableForOrg.kt b/platform/platform-impl/src/com/intellij/ide/plugins/org/PluginManagerConfigurableForOrg.kt index c62e39e0a679..77694eaef763 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/org/PluginManagerConfigurableForOrg.kt +++ b/platform/platform-impl/src/com/intellij/ide/plugins/org/PluginManagerConfigurableForOrg.kt @@ -1,19 +1,9 @@ // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.ide.plugins.org -import com.intellij.icons.AllIcons import com.intellij.ide.plugins.IdeaPluginDescriptor -import com.intellij.lang.LangBundle -import com.intellij.openapi.application.ApplicationInfo import com.intellij.openapi.components.Service import com.intellij.openapi.components.service -import com.intellij.openapi.util.SystemInfo -import com.intellij.openapi.util.text.HtmlChunk -import com.intellij.ui.JBColor -import com.intellij.ui.components.JBLabel -import com.intellij.util.ui.JBUI -import com.intellij.util.ui.components.BorderLayoutPanel -import javax.swing.SwingConstants /** * This is the common service to deal with organizational @@ -26,10 +16,12 @@ class PluginManagerConfigurableForOrg { fun getInstance(): PluginManagerConfigurableForOrg = service() } - fun isPluginAllowed(descriptor: IdeaPluginDescriptor) : Boolean { + fun isPluginAllowed(isLocalPlugin: Boolean, + descriptor: IdeaPluginDescriptor) : Boolean { + + if (isLocalPlugin) return true return descriptor.pluginId.idString.hashCode() % 2 == 0 } fun allowInstallFromDisk(): Boolean = false } -