Forgot to commit UserModel with cookie field

James Moger

2012-07-11 a31cf95ac0787eb559cb78f48c52bc6b79e970d8

 src/com/gitblit/client/RepositoriesPanel.java

@@ -27,7 +27,9 @@
import java.awt.event.MouseEvent;

import java.io.IOException;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.Map;



import javax.swing.JButton;

import javax.swing.JLabel;

@@ -44,7 +46,9 @@
import javax.swing.table.TableCellRenderer;

import javax.swing.table.TableRowSorter;



import com.gitblit.Constants;

import com.gitblit.Constants.RpcRequest;

import com.gitblit.Keys;

import com.gitblit.models.FeedModel;

import com.gitblit.models.RepositoryModel;

import com.gitblit.utils.StringUtils;

@@ -248,7 +252,7 @@
      repositoryControls.add(searchRepository);



      setLayout(new BorderLayout(Utils.MARGIN, Utils.MARGIN));

      header = new HeaderPanel(Translation.get("gb.repositories"), "gitweb-favicon.png");

      header = new HeaderPanel(Translation.get("gb.repositories"), "git-orange-16x16.png");

      add(header, BorderLayout.NORTH);

      add(repositoryTablePanel, BorderLayout.CENTER);

      add(repositoryControls, BorderLayout.SOUTH);

@@ -353,10 +357,12 @@
   protected void createRepository() {

      EditRepositoryDialog dialog = new EditRepositoryDialog(gitblit.getProtocolVersion());

      dialog.setLocationRelativeTo(RepositoriesPanel.this);

      dialog.setAccessRestriction(gitblit.getDefaultAccessRestriction());

      dialog.setUsers(null, gitblit.getUsernames(), null);

      dialog.setTeams(gitblit.getTeamnames(), null);

      dialog.setRepositories(gitblit.getRepositories());

      dialog.setFederationSets(gitblit.getFederationSets(), null);

      dialog.setIndexedBranches(new ArrayList<String>(Arrays.asList(Constants.DEFAULT_BRANCH)), null);

      dialog.setPreReceiveScripts(gitblit.getPreReceiveScriptsUnused(null),

            gitblit.getPreReceiveScriptsInherited(null), null);

      dialog.setPostReceiveScripts(gitblit.getPostReceiveScriptsUnused(null),

@@ -419,10 +425,18 @@
      dialog.setTeams(gitblit.getTeamnames(), gitblit.getPermittedTeamnames(repository));

      dialog.setRepositories(gitblit.getRepositories());

      dialog.setFederationSets(gitblit.getFederationSets(), repository.federationSets);

      List<String> allLocalBranches = new ArrayList<String>();

      allLocalBranches.add(Constants.DEFAULT_BRANCH);

      allLocalBranches.addAll(repository.getLocalBranches());

      dialog.setIndexedBranches(allLocalBranches, repository.indexedBranches);

      dialog.setPreReceiveScripts(gitblit.getPreReceiveScriptsUnused(repository),

            gitblit.getPreReceiveScriptsInherited(repository), repository.preReceiveScripts);

      dialog.setPostReceiveScripts(gitblit.getPostReceiveScriptsUnused(repository),

            gitblit.getPostReceiveScriptsInherited(repository), repository.postReceiveScripts);

      if (gitblit.getSettings().hasKey(Keys.groovy.customFields)) {

         Map<String, String> map = gitblit.getSettings().get(Keys.groovy.customFields).getMap();

         dialog.setCustomFields(repository, map);

      }

      dialog.setVisible(true);

      final RepositoryModel revisedRepository = dialog.getRepository();

      final List<String> permittedUsers = dialog.getPermittedUsers();