saheba
2013-03-25 3eb83d71a5a1ed8385a606c7bdede066b1a00d72
added attribute useIncrementalRevisionNumbers to repository model
6 files modified
15 ■■■■■ changed files
src/com/gitblit/GitBlit.java 2 ●●●●● patch | view | raw | blame | history
src/com/gitblit/client/EditRepositoryDialog.java 7 ●●●●● patch | view | raw | blame | history
src/com/gitblit/models/RepositoryModel.java 2 ●●●●● patch | view | raw | blame | history
src/com/gitblit/wicket/GitBlitWebApp.properties 2 ●●●●● patch | view | raw | blame | history
src/com/gitblit/wicket/pages/EditRepositoryPage.html 1 ●●●● patch | view | raw | blame | history
src/com/gitblit/wicket/pages/EditRepositoryPage.java 1 ●●●● patch | view | raw | blame | history
src/com/gitblit/GitBlit.java
@@ -1668,6 +1668,7 @@
            model.addOwners(ArrayUtils.fromString(getConfig(config, "owner", "")));
            model.useTickets = getConfig(config, "useTickets", false);
            model.useDocs = getConfig(config, "useDocs", false);
            model.useIncrementalRevisionNumbers = getConfig(config, "useIncrementalRevisionNumbers", false);
            model.allowForks = getConfig(config, "allowForks", true);
            model.accessRestriction = AccessRestrictionType.fromName(getConfig(config,
                    "accessRestriction", settings.getString(Keys.git.defaultAccessRestriction, null)));
@@ -2186,6 +2187,7 @@
        config.setString(Constants.CONFIG_GITBLIT, null, "owner", ArrayUtils.toString(repository.owners));
        config.setBoolean(Constants.CONFIG_GITBLIT, null, "useTickets", repository.useTickets);
        config.setBoolean(Constants.CONFIG_GITBLIT, null, "useDocs", repository.useDocs);
        config.setBoolean(Constants.CONFIG_GITBLIT, null, "useIncrementalRevisionNumbers", repository.useIncrementalRevisionNumbers);
        config.setBoolean(Constants.CONFIG_GITBLIT, null, "allowForks", repository.allowForks);
        config.setString(Constants.CONFIG_GITBLIT, null, "accessRestriction", repository.accessRestriction.name());
        config.setString(Constants.CONFIG_GITBLIT, null, "authorizationControl", repository.authorizationControl.name());
src/com/gitblit/client/EditRepositoryDialog.java
@@ -92,6 +92,8 @@
    private JCheckBox useDocs;
    private JCheckBox useIncrementalRevisionNumbers;
    private JCheckBox showRemoteBranches;
    private JCheckBox showReadme;
@@ -212,6 +214,8 @@
                anRepository.useTickets);
        useDocs = new JCheckBox(Translation.get("gb.useDocsDescription"),
                anRepository.useDocs);
        useIncrementalRevisionNumbers = new JCheckBox(Translation.get("gb.useIncrementalRevisionNumbersDescription"),
                anRepository.useIncrementalRevisionNumbers);
        showRemoteBranches = new JCheckBox(
                Translation.get("gb.showRemoteBranchesDescription"),
                anRepository.showRemoteBranches);
@@ -309,6 +313,8 @@
                useTickets));
        fieldsPanel
                .add(newFieldPanel(Translation.get("gb.enableDocs"), useDocs));
        fieldsPanel
        .add(newFieldPanel(Translation.get("gb.enableIncrementalRevisionNumbers"), useIncrementalRevisionNumbers));
        fieldsPanel.add(newFieldPanel(Translation.get("gb.showRemoteBranches"),
                showRemoteBranches));
        fieldsPanel.add(newFieldPanel(Translation.get("gb.showReadme"),
@@ -563,6 +569,7 @@
        repository.gcThreshold = gcThreshold.getText();
        repository.useTickets = useTickets.isSelected();
        repository.useDocs = useDocs.isSelected();
        repository.useIncrementalRevisionNumbers = useIncrementalRevisionNumbers.isSelected();
        repository.showRemoteBranches = showRemoteBranches.isSelected();
        repository.showReadme = showReadme.isSelected();
        repository.skipSizeCalculation = skipSizeCalculation.isSelected();
src/com/gitblit/models/RepositoryModel.java
@@ -50,6 +50,7 @@
    public boolean showRemoteBranches;
    public boolean useTickets;
    public boolean useDocs;
    public boolean useIncrementalRevisionNumbers;
    public AccessRestrictionType accessRestriction;
    public AuthorizationControl authorizationControl;
    public boolean allowAuthenticated;
@@ -201,6 +202,7 @@
        clone.showRemoteBranches = false;
        clone.allowForks = false;
        clone.useDocs = useDocs;
        clone.useIncrementalRevisionNumbers = useIncrementalRevisionNumbers;
        clone.useTickets = useTickets;
        clone.skipSizeCalculation = skipSizeCalculation;
        clone.skipSummaryMetrics = skipSummaryMetrics;
src/com/gitblit/wicket/GitBlitWebApp.properties
@@ -73,6 +73,7 @@
gb.name = name
gb.enableTickets = enable tickets
gb.enableDocs = enable docs
gb.enableIncrementalRevisionNumbers = enable incremental revision numbers
gb.save = save
gb.showRemoteBranches = show remote branches
gb.editUsers = edit users
@@ -85,6 +86,7 @@
gb.viewRestricted = authenticated view, clone, & push
gb.useTicketsDescription = readonly, distributed Ticgit issues
gb.useDocsDescription = enumerates Markdown documentation in repository
gb.useIncrementalRevisionNumbersDescription = automatic tagging of each push with an incremental revision number
gb.showRemoteBranchesDescription = show remote branches
gb.canAdminDescription = can administer Gitblit server
gb.permittedUsers = permitted users
src/com/gitblit/wicket/pages/EditRepositoryPage.html
@@ -35,6 +35,7 @@
                <tr><th colspan="2"><hr/></th></tr>
                <tr><th><wicket:message key="gb.enableTickets"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="useTickets" tabindex="7" /> &nbsp;<span class="help-inline"><wicket:message key="gb.useTicketsDescription"></wicket:message></span></label></td></tr>
                <tr><th><wicket:message key="gb.enableDocs"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="useDocs" tabindex="8" /> &nbsp;<span class="help-inline"><wicket:message key="gb.useDocsDescription"></wicket:message></span></label></td></tr>
                <tr><th><wicket:message key="gb.enableIncrementalRevisionNumbers"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="useIncrementalRevisionNumbers" tabindex="8" /> &nbsp;<span class="help-inline"><wicket:message key="gb.useIncrementalRevisionNumbersDescription"></wicket:message></span></label></td></tr>
                <tr><th><wicket:message key="gb.showRemoteBranches"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="showRemoteBranches" tabindex="9" /> &nbsp;<span class="help-inline"><wicket:message key="gb.showRemoteBranchesDescription"></wicket:message></span></label></td></tr>
                <tr><th><wicket:message key="gb.showReadme"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="showReadme" tabindex="10" /> &nbsp;<span class="help-inline"><wicket:message key="gb.showReadmeDescription"></wicket:message></span></label></td></tr>
                <tr><th><wicket:message key="gb.skipSizeCalculation"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="skipSizeCalculation" tabindex="11" /> &nbsp;<span class="help-inline"><wicket:message key="gb.skipSizeCalculationDescription"></wicket:message></span></label></td></tr>
src/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -422,6 +422,7 @@
                new FederationTypeRenderer()));
        form.add(new CheckBox("useTickets"));
        form.add(new CheckBox("useDocs"));
        form.add(new CheckBox("useIncrementalRevisionNumbers"));
        form.add(new CheckBox("showRemoteBranches"));
        form.add(new CheckBox("showReadme"));
        form.add(new CheckBox("skipSizeCalculation"));