Manager support for hook script inheritance

James Moger

2011-12-28 97d3afed7f416bc3c0740b05974949ea38520c7e

 src/com/gitblit/RpcServlet.java

@@ -276,7 +276,7 @@
         }

      } else if (RpcRequest.LIST_SETTINGS.equals(reqType)) {

         // return the server's settings

         ServerSettings settings = GitBlit.self().getSettingsModel();			
         ServerSettings settings = GitBlit.self().getSettingsModel();

         if (allowAdmin) {

            // return all settings

            result = settings;

@@ -294,12 +294,12 @@
               keys.add(Keys.federation.sets);

            }

            // build the settings

            ServerSettings managementSettings = new ServerSettings();				
            ServerSettings managementSettings = new ServerSettings();

            for (String key : keys) {

               managementSettings.add(settings.get(key));

            }

            if (allowManagement) {

               settings.pushScripts = settings.pushScripts;

               managementSettings.pushScripts = settings.pushScripts;

            }

            result = managementSettings;

         }