kallithea Changeset - e54f4d943d4a

Changeset - e54f4d943d4a

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich - 9 years ago 2017-01-03 02:06:41
mads@kiilerich.com

settings: fix saving of visual settings of page size

After 19f15cde2cdb it was no longer to save page_size because formfill didn't
match. Back out a part of that changeset.

3 files changed with 4 insertions and 4 deletions:

kallithea/controllers/admin/settings.py

kallithea/model/forms.py

kallithea/templates/admin/settings/settings_visual.html

0 comments (0 inline, 0 general)

kallithea/controllers/admin/settings.py

➞

Show inline comments

@@ @@ -251,25 +251,25 @@ class SettingsController(BaseController) @@
                     defaults=errors.value,
                     errors=errors.error_dict or {},
                     prefix_error=False,
                     encoding="UTF-8",
                     force_defaults=False)
             try:
                 settings = [
                     ('show_public_icon', 'show_public_icon', 'bool'),
                     ('show_private_icon', 'show_private_icon', 'bool'),
                     ('stylify_metatags', 'stylify_metatags', 'bool'),
                     ('repository_fields', 'repository_fields', 'bool'),
-                    ('dashboard_items', 'page_size', 'int'),
+                    ('dashboard_items', 'dashboard_items', 'int'),
                     ('admin_grid_items', 'admin_grid_items', 'int'),
                     ('show_version', 'show_version', 'bool'),
                     ('use_gravatar', 'use_gravatar', 'bool'),
                     ('gravatar_url', 'gravatar_url', 'unicode'),
                     ('clone_uri_tmpl', 'clone_uri_tmpl', 'unicode'),
+                ]
                 for setting, form_key, type_ in settings:
                     Setting.create_or_update(setting, form_result[form_key], type_)
                 Session().commit()
                 set_app_settings(config)
                 h.flash(_('Updated visualisation settings'),

kallithea/model/forms.py

➞

Show inline comments

@@ @@ -351,25 +351,25 @@ def ApplicationSettingsForm(): @@
 def ApplicationVisualisationForm():
     class _ApplicationVisualisationForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         show_public_icon = v.StringBoolean(if_missing=False)
         show_private_icon = v.StringBoolean(if_missing=False)
         stylify_metatags = v.StringBoolean(if_missing=False)
         repository_fields = v.StringBoolean(if_missing=False)
         lightweight_journal = v.StringBoolean(if_missing=False)
-        page_size = v.Int(min=5, not_empty=True)
+        dashboard_items = v.Int(min=5, not_empty=True)
         admin_grid_items = v.Int(min=5, not_empty=True)
         show_version = v.StringBoolean(if_missing=False)
         use_gravatar = v.StringBoolean(if_missing=False)
         gravatar_url = v.UnicodeString(min=3)
         clone_uri_tmpl = v.UnicodeString(min=3)
     return _ApplicationVisualisationForm
 def ApplicationUiSettingsForm():
     class _ApplicationUiSettingsForm(formencode.Schema):
         allow_extra_fields = True

kallithea/templates/admin/settings/settings_visual.html

➞

Show inline comments

@@ @@ -45,27 +45,27 @@ ${h.form(url('admin_settings_visual'), m @@
                     ${h.text('clone_uri_tmpl', size=80, class_='form-control')}
                     <span class="help-block">${_('''Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'.
                                                     The following variables are available:
                                                     {scheme} 'http' or 'https' sent from running Kallithea server,
                                                     {user}   current user username,
                                                     {netloc} network location/server host of running Kallithea server,
                                                     {repo}   full repository name,
                                                     {repoid} ID of repository, can be used to construct clone-by-id''')}</span>
                 </div>
             </div>
             <div class="form-group">
-                <label class="control-label" for="page_size">${_('Repository page size')}:</label>
+                <label class="control-label" for="dashboard_items">${_('Repository page size')}:</label>
                 <div>
-                    ${h.text('page_size',size=5,class_='form-control')}
+                    ${h.text('dashboard_items',size=5,class_='form-control')}
                     <span class="help-block">${_('Number of items displayed in the repository pages before pagination is shown.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="admin_grid_items">${_('Admin page size')}:</label>
                 <div>
                     ${h.text('admin_grid_items',size=5,class_='form-control')}
                     <span class="help-block">${_('Number of items displayed in the admin pages grids before pagination is shown.')}</span>
                 </div>
             </div>

0 comments (0 inline, 0 general)