Ticket Reference handling #1048

Paul Martin

2016-04-27 c2188a840bc4153ae92112b04b2e06a90d3944aa

 src/main/java/com/gitblit/transport/ssh/commands/PluginDispatcher.java

@@ -33,7 +33,6 @@
import com.gitblit.models.PluginRegistry.InstallState;
import com.gitblit.models.PluginRegistry.PluginRegistration;
import com.gitblit.models.PluginRegistry.PluginRelease;
import com.gitblit.models.UserModel;
import com.gitblit.utils.FlipTable;
import com.gitblit.utils.FlipTable.Borders;
import com.gitblit.utils.StringUtils;
@@ -49,18 +48,18 @@
public class PluginDispatcher extends DispatchCommand {

   @Override
   protected void setup(UserModel user) {
      register(user, ListPlugins.class);
      register(user, StartPlugin.class);
      register(user, StopPlugin.class);
      register(user, EnablePlugin.class);
      register(user, DisablePlugin.class);
      register(user, ShowPlugin.class);
      register(user, RefreshPlugins.class);
      register(user, AvailablePlugins.class);
      register(user, InstallPlugin.class);
      register(user, UpgradePlugin.class);
      register(user, UninstallPlugin.class);
   protected void setup() {
      register(ListPlugins.class);
      register(StartPlugin.class);
      register(StopPlugin.class);
      register(EnablePlugin.class);
      register(DisablePlugin.class);
      register(ShowPlugin.class);
      register(RefreshPlugins.class);
      register(AvailablePlugins.class);
      register(InstallPlugin.class);
      register(UpgradePlugin.class);
      register(UninstallPlugin.class);
   }

   @CommandMetaData(name = "list", aliases = { "ls" }, description = "List plugins")
@@ -284,7 +283,7 @@
            state = Joiner.on(", ").join(InstallState.INSTALLED, pw.getPluginState());
         } else {
            // registered, installed plugin
            state = Joiner.on(", ").join(reg.getInstallState(), pw.getPluginState());
            state = Joiner.on(", ").join(reg.getInstallState(system), pw.getPluginState());
         }

         StringBuilder sb = new StringBuilder();
@@ -487,9 +486,9 @@
               curr = new PluginRelease();
            }
            if (verbose) {
               data[i] = new Object[] {p.id, p.description, p.installedRelease, curr.version, curr.requires, p.getInstallState(), p.registry};
               data[i] = new Object[] {p.id, p.description, p.installedRelease, curr.version, curr.requires, p.getInstallState(system), p.registry};
            } else {
               data[i] = new Object[] {p.id, p.installedRelease, curr.version, curr.requires, p.getInstallState()};
               data[i] = new Object[] {p.id, p.installedRelease, curr.version, curr.requires, p.getInstallState(system)};
            }
         }

@@ -505,9 +504,9 @@
               curr = new PluginRelease();
            }
            if (verbose) {
               outTabbed(p.id, p.description, p.installedRelease, curr.version, curr.requires, p.getInstallState(), p.provider, p.registry);
               outTabbed(p.id, p.description, p.installedRelease, curr.version, curr.requires, p.getInstallState(system), p.provider, p.registry);
            } else {
               outTabbed(p.id, p.installedRelease, curr.version, curr.requires, p.getInstallState());
               outTabbed(p.id, p.installedRelease, curr.version, curr.requires, p.getInstallState(system));
            }
         }
      }