diff options
Diffstat (limited to 'src/com/gitblit/client/RepositoriesPanel.java')
| -rw-r--r-- | src/com/gitblit/client/RepositoriesPanel.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/gitblit/client/RepositoriesPanel.java b/src/com/gitblit/client/RepositoriesPanel.java index 50284be1..104010d5 100644 --- a/src/com/gitblit/client/RepositoriesPanel.java +++ b/src/com/gitblit/client/RepositoriesPanel.java @@ -357,8 +357,10 @@ public abstract class RepositoriesPanel extends JPanel { dialog.setTeams(gitblit.getTeamnames(), null);
dialog.setRepositories(gitblit.getRepositories());
dialog.setFederationSets(gitblit.getFederationSets(), null);
- dialog.setPreReceiveScripts(gitblit.getPreReceiveScriptsUnused(null), null);
- dialog.setPostReceiveScripts(gitblit.getPostReceiveScriptsUnused(null), null);
+ dialog.setPreReceiveScripts(gitblit.getPreReceiveScriptsUnused(null),
+ gitblit.getPreReceiveScriptsInherited(null), null);
+ dialog.setPostReceiveScripts(gitblit.getPostReceiveScriptsUnused(null),
+ gitblit.getPostReceiveScriptsInherited(null), null);
dialog.setVisible(true);
final RepositoryModel newRepository = dialog.getRepository();
final List<String> permittedUsers = dialog.getPermittedUsers();
@@ -418,9 +420,9 @@ public abstract class RepositoriesPanel extends JPanel { dialog.setRepositories(gitblit.getRepositories());
dialog.setFederationSets(gitblit.getFederationSets(), repository.federationSets);
dialog.setPreReceiveScripts(gitblit.getPreReceiveScriptsUnused(repository),
- repository.preReceiveScripts);
+ gitblit.getPreReceiveScriptsInherited(repository), repository.preReceiveScripts);
dialog.setPostReceiveScripts(gitblit.getPostReceiveScriptsUnused(repository),
- repository.postReceiveScripts);
+ gitblit.getPostReceiveScriptsInherited(repository), repository.postReceiveScripts);
dialog.setVisible(true);
final RepositoryModel revisedRepository = dialog.getRepository();
final List<String> permittedUsers = dialog.getPermittedUsers();
|