kallithea Changeset - f2dc57c123cf

Changeset - f2dc57c123cf

Parent rev.

Child rev.

[Not reviewed]

stable

0 5 0

Mads Kiilerich - 3 years ago 2022-12-12 00:25:22
mads@kiilerich.com

repo: introduce enable_downloads and enable_statistics when creating repos

These booleans were not shown in the normal repo creation form, so the form
validation applied the "default" values of False. These values were however not
used by the model when creating repos - it just unconditionally used the real
global defaults.

The API already exposed some of this, but it wasn't implemented.

The web form for creating repos lacked these fields, but it was present in the
repo edit form. Just make these fields mandatory. There will thus not be any
defaults to apply in the model for creating repos.

5 files changed with 22 insertions and 9 deletions:

kallithea/controllers/api/api.py

kallithea/model/repo.py

kallithea/templates/admin/repos/repo_add_base.html

kallithea/tests/api/api_base.py

kallithea/tests/fixture.py

0 comments (0 inline, 0 general)

kallithea/controllers/api/api.py

➞

Show inline comments

@@ @@ -1230,8 +1230,8 @@ class ApiController(JSONRPCController): @@
                 clone_uri=clone_uri,
                 repo_group=group_name,
                 repo_landing_rev=landing_rev,
                 enable_statistics=enable_statistics,
                 enable_downloads=enable_downloads,
                 repo_enable_statistics=enable_statistics,
                 repo_enable_downloads=enable_downloads,
                 repo_copy_permissions=copy_permissions,
+            )

kallithea/model/repo.py

➞

Show inline comments

@@ @@ -711,13 +711,10 @@ def create_repo(form_data, cur_user): @@
     copy_fork_permissions = form_data.get('copy_permissions')
     copy_group_permissions = form_data.get('repo_copy_permissions')
     fork_of = form_data.get('fork_parent_id')
     enable_statistics = form_data['repo_enable_statistics']
     enable_downloads = form_data['repo_enable_downloads']
     state = form_data.get('repo_state', db.Repository.STATE_PENDING)
     # repo creation defaults, private and repo_type are filled in form
     defs = db.Setting.get_default_repo_settings(strip_prefix=True)
     enable_statistics = defs.get('repo_enable_statistics')
     enable_downloads = defs.get('repo_enable_downloads')
     try:
         db_repo = RepoModel()._create_repo(
             repo_name=repo_name_full,

kallithea/templates/admin/repos/repo_add_base.html

➞

Show inline comments

@@ @@ -58,6 +58,20 @@ ${h.form(url('repos'))} @@
             </div>
         </div>
         <div class="form-group">
             <label class="control-label" for="repo_enable_statistics">${_('Enable statistics')}:</label>
             <div>
                 ${h.checkbox('repo_enable_statistics',value="True")}
                 <span class="help-block">${_('Enable statistics window on summary page.')}</span>
             </div>
         </div>
         <div class="form-group">
             <label class="control-label" for="repo_enable_downloads">${_('Enable downloads')}:</label>
             <div>
                 ${h.checkbox('repo_enable_downloads',value="True")}
                 <span class="help-block">${_('Enable download menu on summary page.')}</span>
             </div>
         </div>
         <div class="form-group">
             <div class="buttons">
                 ${h.submit('add',_('Add'),class_="btn btn-default")}
             </div>

kallithea/tests/api/api_base.py

➞

Show inline comments

@@ @@ -792,8 +792,8 @@ class _BaseTestApi(object): @@
         ('clone_uri', {'clone_uri': None}),
         ('landing_rev', {'landing_rev': 'branch:master'}),
         ('private', {'private': True}),
         #('enable_statistics', {'enable_statistics': True}),  # currently broken
         #('enable_downloads', {'enable_downloads': True}),  # currently broken
         ('enable_statistics', {'enable_statistics': True}),
         ('enable_downloads', {'enable_downloads': True}),
         ('repo_group', {'group': 'test_group_for_update'}),
     ])
     def test_api_create_repo(self, changing_attr, updates):

kallithea/tests/fixture.py

➞

Show inline comments

@@ @@ -95,6 +95,8 @@ class Fixture(object): @@
             repo_group='-1',
             repo_description='DESC',
             repo_private=False,
             repo_enable_statistics=False,
             repo_enable_downloads=False,
             repo_landing_rev='rev:tip',
             repo_copy_permissions=False,
             repo_state=db.Repository.STATE_CREATED,

0 comments (0 inline, 0 general)