Restore blockpush and localclone hooks to binaries (issue-303)

James Moger

2013-09-05 7847af6e63e7adef6ec8d99a1809e91472d2bc2d

 src/main/java/com/gitblit/authority/GitblitAuthority.java

@@ -261,12 +261,9 @@
      String us = gitblitSettings.getString(Keys.realm.userService, "${baseFolder}/users.conf");

      String ext = us.substring(us.lastIndexOf(".") + 1).toLowerCase();

      IUserService service = null;

      if (!ext.equals("conf") && !ext.equals("properties")) {

         if (us.equals("com.gitblit.LdapUserService")) {

            us = gitblitSettings.getString(Keys.realm.ldap.backingUserService, "${baseFolder}/users.conf");		
         } else if (us.equals("com.gitblit.LdapUserService")) {

            us = gitblitSettings.getString(Keys.realm.redmine.backingUserService, "${baseFolder}/users.conf");

         }

      if (!ext.equals("conf") && !ext.equals("properties") && ext.contains("userservice")) {

         String realm = ext.substring(0, ext.indexOf("userservice"));

         us = gitblitSettings.getString(MessageFormat.format("realm.{0}.backingUserService", realm), "${baseFolder}/users.conf");

      }



      if (us.endsWith(".conf")) {

@@ -464,9 +461,9 @@
            

            // refresh user

            ucm.certs = null;

            int modelIndex = table.convertRowIndexToModel(table.getSelectedRow());

            int selectedIndex = table.getSelectedRow();

            tableModel.fireTableDataChanged();

            table.getSelectionModel().setSelectionInterval(modelIndex, modelIndex);

            table.getSelectionModel().setSelectionInterval(selectedIndex, selectedIndex);

            

            if (sendEmail) {

               sendEmail(user, metadata, zip);

@@ -804,6 +801,8 @@
   }

   

   private void filterUsers(final String fragment) {

      table.clearSelection();

      userCertificatePanel.setUserCertificateModel(null);

      if (StringUtils.isEmpty(fragment)) {

         table.setRowSorter(defaultSorter);

         return;