diff --git a/kallithea/controllers/admin/gists.py b/kallithea/controllers/admin/gists.py
--- a/kallithea/controllers/admin/gists.py
+++ b/kallithea/controllers/admin/gists.py
@@ -67,8 +67,6 @@ class GistsController(BaseController):
@LoginRequired()
def index(self):
- """GET /admin/gists: All items in the collection"""
- # url('gists')
not_default_user = not c.authuser.is_default_user
c.show_private = request.GET.get('private') and not_default_user
c.show_public = request.GET.get('public') and not_default_user
@@ -104,8 +102,6 @@ class GistsController(BaseController):
@LoginRequired()
@NotAnonymous()
def create(self):
- """POST /admin/gists: Create a new item"""
- # url('gists')
self.__load_defaults()
gist_form = GistForm([x[0] for x in c.lifetime_values])()
try:
@@ -149,8 +145,6 @@ class GistsController(BaseController):
@LoginRequired()
@NotAnonymous()
def new(self, format='html'):
- """GET /admin/gists/new: Form to create a new item"""
- # url('new_gist')
self.__load_defaults()
return render('admin/gists/new.html')
@@ -168,13 +162,6 @@ class GistsController(BaseController):
@LoginRequired()
@NotAnonymous()
def delete(self, gist_id):
- """DELETE /admin/gists/gist_id: Delete an existing item"""
- # Forms posted to this method should contain a hidden field:
- #
- # Or using helpers:
- # h.form(url('gist', gist_id=ID),
- # method='delete')
- # url('gist', gist_id=ID)
gist = GistModel().get_gist(gist_id)
owner = gist.gist_owner == c.authuser.user_id
if h.HasPermissionAny('hg.admin')() or owner:
@@ -188,8 +175,6 @@ class GistsController(BaseController):
@LoginRequired()
def show(self, gist_id, revision='tip', format='html', f_path=None):
- """GET /admin/gists/gist_id: Show a specific item"""
- # url('gist', gist_id=ID)
c.gist = Gist.get_or_404(gist_id)
#check if this gist is not expired
@@ -213,8 +198,6 @@ class GistsController(BaseController):
@LoginRequired()
@NotAnonymous()
def edit(self, gist_id, format='html'):
- """GET /admin/gists/gist_id/edit: Form to edit an existing item"""
- # url('edit_gist', gist_id=ID)
c.gist = Gist.get_or_404(gist_id)
#check if this gist is not expired
diff --git a/kallithea/controllers/admin/my_account.py b/kallithea/controllers/admin/my_account.py
--- a/kallithea/controllers/admin/my_account.py
+++ b/kallithea/controllers/admin/my_account.py
@@ -91,10 +91,6 @@ class MyAccountController(BaseController
return json.dumps(repos_data)
def my_account(self):
- """
- GET /_admin/my_account Displays info about my account
- """
- # url('my_account')
c.active = 'profile'
self.__load_data()
c.perm_user = AuthUser(user_id=self.authuser.user_id)
diff --git a/kallithea/controllers/admin/notifications.py b/kallithea/controllers/admin/notifications.py
--- a/kallithea/controllers/admin/notifications.py
+++ b/kallithea/controllers/admin/notifications.py
@@ -58,8 +58,6 @@ class NotificationsController(BaseContro
super(NotificationsController, self).__before__()
def index(self, format='html'):
- """GET /_admin/notifications: All items in the collection"""
- # url('notifications')
c.user = self.authuser
notif = NotificationModel().query_for_user(self.authuser.user_id,
filter_=request.GET.getall('type'))
@@ -101,13 +99,6 @@ class NotificationsController(BaseContro
# url('new_notification')
def update(self, notification_id):
- """PUT /_admin/notifications/id: Update an existing item"""
- # Forms posted to this method should contain a hidden field:
- #
- # Or using helpers:
- # h.form(url('notification', notification_id=ID),
- # method='put')
- # url('notification', notification_id=ID)
try:
no = Notification.get(notification_id)
owner = all(un.user.user_id == c.authuser.user_id
@@ -123,13 +114,6 @@ class NotificationsController(BaseContro
raise HTTPBadRequest()
def delete(self, notification_id):
- """DELETE /_admin/notifications/id: Delete an existing item"""
- # Forms posted to this method should contain a hidden field:
- #
- # Or using helpers:
- # h.form(url('notification', notification_id=ID),
- # method='delete')
- # url('notification', notification_id=ID)
try:
no = Notification.get(notification_id)
owner = any(un.user.user_id == c.authuser.user_id
@@ -145,8 +129,6 @@ class NotificationsController(BaseContro
raise HTTPBadRequest()
def show(self, notification_id, format='html'):
- """GET /_admin/notifications/id: Show a specific item"""
- # url('notification', notification_id=ID)
notification = Notification.get_or_404(notification_id)
unotification = NotificationModel() \
diff --git a/kallithea/controllers/admin/repo_groups.py b/kallithea/controllers/admin/repo_groups.py
--- a/kallithea/controllers/admin/repo_groups.py
+++ b/kallithea/controllers/admin/repo_groups.py
@@ -108,8 +108,6 @@ class RepoGroupsController(BaseControlle
return False
def index(self, format='html'):
- """GET /repo_groups: All items in the collection"""
- # url('repos_groups')
_list = RepoGroup.query() \
.order_by(func.lower(RepoGroup.group_name)) \
.all()
@@ -155,9 +153,6 @@ class RepoGroupsController(BaseControlle
return render('admin/repo_groups/repo_groups.html')
def create(self):
- """POST /repo_groups: Create a new item"""
- # url('repos_groups')
-
self.__load_defaults()
# permissions for can create group based on parent_id are checked
@@ -194,8 +189,6 @@ class RepoGroupsController(BaseControlle
raise HTTPFound(location=url('repos_group_home', group_name=gr.group_name))
def new(self):
- """GET /repo_groups/new: Form to create a new item"""
- # url('new_repos_group')
if HasPermissionAny('hg.admin')('group create'):
#we're global admin, we're ok and we can create TOP level groups
pass
@@ -215,14 +208,6 @@ class RepoGroupsController(BaseControlle
@HasRepoGroupPermissionAnyDecorator('group.admin')
def update(self, group_name):
- """PUT /repo_groups/group_name: Update an existing item"""
- # Forms posted to this method should contain a hidden field:
- #
- # Or using helpers:
- # h.form(url('repos_group', group_name=GROUP_NAME),
- # method='put')
- # url('repos_group', group_name=GROUP_NAME)
-
c.repo_group = RepoGroupModel()._get_repo_group(group_name)
self.__load_defaults(extras=[c.repo_group.parent_group],
exclude=[c.repo_group])
@@ -269,14 +254,6 @@ class RepoGroupsController(BaseControlle
@HasRepoGroupPermissionAnyDecorator('group.admin')
def delete(self, group_name):
- """DELETE /repo_groups/group_name: Delete an existing item"""
- # Forms posted to this method should contain a hidden field:
- #
- # Or using helpers:
- # h.form(url('repos_group', group_name=GROUP_NAME),
- # method='delete')
- # url('repos_group', group_name=GROUP_NAME)
-
gr = c.repo_group = RepoGroupModel()._get_repo_group(group_name)
repos = gr.repositories.all()
if repos:
@@ -319,8 +296,6 @@ class RepoGroupsController(BaseControlle
@HasRepoGroupPermissionAnyDecorator('group.read', 'group.write',
'group.admin')
def show(self, group_name):
- """GET /repo_groups/group_name: Show a specific item"""
- # url('repos_group', group_name=GROUP_NAME)
c.active = 'settings'
c.group = c.repo_group = RepoGroupModel()._get_repo_group(group_name)
@@ -347,8 +322,6 @@ class RepoGroupsController(BaseControlle
@HasRepoGroupPermissionAnyDecorator('group.admin')
def edit(self, group_name):
- """GET /repo_groups/group_name/edit: Form to edit an existing item"""
- # url('edit_repo_group', group_name=GROUP_NAME)
c.active = 'settings'
c.repo_group = RepoGroupModel()._get_repo_group(group_name)
@@ -365,8 +338,6 @@ class RepoGroupsController(BaseControlle
@HasRepoGroupPermissionAnyDecorator('group.admin')
def edit_repo_group_advanced(self, group_name):
- """GET /repo_groups/group_name/edit: Form to edit an existing item"""
- # url('edit_repo_group', group_name=GROUP_NAME)
c.active = 'advanced'
c.repo_group = RepoGroupModel()._get_repo_group(group_name)
@@ -374,8 +345,6 @@ class RepoGroupsController(BaseControlle
@HasRepoGroupPermissionAnyDecorator('group.admin')
def edit_repo_group_perms(self, group_name):
- """GET /repo_groups/group_name/edit: Form to edit an existing item"""
- # url('edit_repo_group', group_name=GROUP_NAME)
c.active = 'perms'
c.repo_group = RepoGroupModel()._get_repo_group(group_name)
self.__load_defaults()
@@ -421,11 +390,6 @@ class RepoGroupsController(BaseControlle
@HasRepoGroupPermissionAnyDecorator('group.admin')
def delete_perms(self, group_name):
- """
- DELETE an existing repository group permission user
-
- :param group_name:
- """
try:
obj_type = request.POST.get('obj_type')
obj_id = None
diff --git a/kallithea/controllers/admin/repos.py b/kallithea/controllers/admin/repos.py
--- a/kallithea/controllers/admin/repos.py
+++ b/kallithea/controllers/admin/repos.py
@@ -99,8 +99,6 @@ class ReposController(BaseRepoController
return defaults
def index(self, format='html'):
- """GET /repos: All items in the collection"""
- # url('repos')
_list = Repository.query() \
.order_by(func.lower(Repository.repo_name)) \
.all()
@@ -116,10 +114,6 @@ class ReposController(BaseRepoController
@NotAnonymous()
def create(self):
- """
- POST /repos: Create a new item"""
- # url('repos')
-
self.__load_defaults()
form_result = {}
task_id = None
@@ -158,7 +152,6 @@ class ReposController(BaseRepoController
@NotAnonymous()
def create_repository(self):
- """GET /_admin/create_repository: Form to create a new item"""
self.__load_defaults()
if not c.repo_groups:
raise HTTPForbidden
@@ -227,14 +220,6 @@ class ReposController(BaseRepoController
@HasRepoPermissionAnyDecorator('repository.admin')
def update(self, repo_name):
- """
- PUT /repos/repo_name: Update an existing item"""
- # Forms posted to this method should contain a hidden field:
- #
- # Or using helpers:
- # h.form(url('put_repo', repo_name=ID),
- # method='put')
- # url('put_repo', repo_name=ID)
c.repo_info = self._load_repo(repo_name)
self.__load_defaults(c.repo_info)
c.active = 'settings'
@@ -284,15 +269,6 @@ class ReposController(BaseRepoController
@HasRepoPermissionAnyDecorator('repository.admin')
def delete(self, repo_name):
- """
- DELETE /repos/repo_name: Delete an existing item"""
- # Forms posted to this method should contain a hidden field:
- #
- # Or using helpers:
- # h.form(url('delete_repo', repo_name=ID),
- # method='delete')
- # url('delete_repo', repo_name=ID)
-
repo_model = RepoModel()
repo = repo_model.get_by_repo_name(repo_name)
if not repo:
@@ -330,8 +306,6 @@ class ReposController(BaseRepoController
@HasRepoPermissionAnyDecorator('repository.admin')
def edit(self, repo_name):
- """GET /repo_name/settings: Form to edit an existing item"""
- # url('edit_repo', repo_name=ID)
defaults = self.__load_data(repo_name)
c.repo_fields = RepositoryField.query() \
.filter(RepositoryField.repository == c.repo_info).all()
@@ -346,8 +320,6 @@ class ReposController(BaseRepoController
@HasRepoPermissionAnyDecorator('repository.admin')
def edit_permissions(self, repo_name):
- """GET /repo_name/settings: Form to edit an existing item"""
- # url('edit_repo', repo_name=ID)
c.repo_info = self._load_repo(repo_name)
repo_model = RepoModel()
c.users_array = repo_model.get_users_js()
@@ -399,8 +371,6 @@ class ReposController(BaseRepoController
@HasRepoPermissionAnyDecorator('repository.admin')
def edit_fields(self, repo_name):
- """GET /repo_name/settings: Form to edit an existing item"""
- # url('edit_repo', repo_name=ID)
c.repo_info = self._load_repo(repo_name)
c.repo_fields = RepositoryField.query() \
.filter(RepositoryField.repository == c.repo_info).all()
@@ -445,8 +415,6 @@ class ReposController(BaseRepoController
@HasRepoPermissionAnyDecorator('repository.admin')
def edit_advanced(self, repo_name):
- """GET /repo_name/settings: Form to edit an existing item"""
- # url('edit_repo', repo_name=ID)
c.repo_info = self._load_repo(repo_name)
c.default_user_id = User.get_default_user().user_id
c.in_public_journal = UserFollowing.query() \
@@ -544,12 +512,6 @@ class ReposController(BaseRepoController
@HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
def toggle_locking(self, repo_name):
- """
- Toggle locking of repository by simple GET call to url
-
- :param repo_name:
- """
-
try:
repo = Repository.get_by_repo_name(repo_name)
@@ -569,8 +531,6 @@ class ReposController(BaseRepoController
@HasRepoPermissionAnyDecorator('repository.admin')
def edit_caches(self, repo_name):
- """GET /repo_name/settings: Form to edit an existing item"""
- # url('edit_repo', repo_name=ID)
c.repo_info = self._load_repo(repo_name)
c.active = 'caches'
if request.POST:
@@ -589,8 +549,6 @@ class ReposController(BaseRepoController
@HasRepoPermissionAnyDecorator('repository.admin')
def edit_remote(self, repo_name):
- """GET /repo_name/settings: Form to edit an existing item"""
- # url('edit_repo', repo_name=ID)
c.repo_info = self._load_repo(repo_name)
c.active = 'remote'
if request.POST:
@@ -606,8 +564,6 @@ class ReposController(BaseRepoController
@HasRepoPermissionAnyDecorator('repository.admin')
def edit_statistics(self, repo_name):
- """GET /repo_name/settings: Form to edit an existing item"""
- # url('edit_repo', repo_name=ID)
c.repo_info = self._load_repo(repo_name)
repo = c.repo_info.scm_instance
diff --git a/kallithea/controllers/admin/settings.py b/kallithea/controllers/admin/settings.py
--- a/kallithea/controllers/admin/settings.py
+++ b/kallithea/controllers/admin/settings.py
@@ -84,8 +84,6 @@ class SettingsController(BaseController)
@HasPermissionAnyDecorator('hg.admin')
def settings_vcs(self):
- """GET /admin/settings: All items in the collection"""
- # url('admin_settings')
c.active = 'vcs'
if request.POST:
application_form = ApplicationUiSettingsForm()()
@@ -162,8 +160,6 @@ class SettingsController(BaseController)
@HasPermissionAnyDecorator('hg.admin')
def settings_mapping(self):
- """GET /admin/settings/mapping: All items in the collection"""
- # url('admin_settings_mapping')
c.active = 'mapping'
if request.POST:
rm_obsolete = request.POST.get('destroy', False)
@@ -202,8 +198,6 @@ class SettingsController(BaseController)
@HasPermissionAnyDecorator('hg.admin')
def settings_global(self):
- """GET /admin/settings/global: All items in the collection"""
- # url('admin_settings_global')
c.active = 'global'
if request.POST:
application_form = ApplicationSettingsForm()()
@@ -262,8 +256,6 @@ class SettingsController(BaseController)
@HasPermissionAnyDecorator('hg.admin')
def settings_visual(self):
- """GET /admin/settings/visual: All items in the collection"""
- # url('admin_settings_visual')
c.active = 'visual'
if request.POST:
application_form = ApplicationVisualisationForm()()
@@ -320,8 +312,6 @@ class SettingsController(BaseController)
@HasPermissionAnyDecorator('hg.admin')
def settings_email(self):
- """GET /admin/settings/email: All items in the collection"""
- # url('admin_settings_email')
c.active = 'email'
if request.POST:
test_email = request.POST.get('test_email')
@@ -361,8 +351,6 @@ class SettingsController(BaseController)
@HasPermissionAnyDecorator('hg.admin')
def settings_hooks(self):
- """GET /admin/settings/hooks: All items in the collection"""
- # url('admin_settings_hooks')
c.active = 'hooks'
if request.POST:
if c.visual.allow_custom_hooks_settings:
@@ -412,8 +400,6 @@ class SettingsController(BaseController)
@HasPermissionAnyDecorator('hg.admin')
def settings_search(self):
- """GET /admin/settings/search: All items in the collection"""
- # url('admin_settings_search')
c.active = 'search'
if request.POST:
repo_location = self._get_hg_ui_settings()['paths_root_path']
@@ -433,8 +419,6 @@ class SettingsController(BaseController)
@HasPermissionAnyDecorator('hg.admin')
def settings_system(self):
- """GET /admin/settings/system: All items in the collection"""
- # url('admin_settings_system')
c.active = 'system'
defaults = Setting.get_app_settings()
@@ -455,8 +439,6 @@ class SettingsController(BaseController)
@HasPermissionAnyDecorator('hg.admin')
def settings_system_update(self):
- """GET /admin/settings/system/updates: All items in the collection"""
- # url('admin_settings_system_update')
import json
import urllib2
from kallithea.lib.verlib import NormalizedVersion
diff --git a/kallithea/controllers/admin/user_groups.py b/kallithea/controllers/admin/user_groups.py
--- a/kallithea/controllers/admin/user_groups.py
+++ b/kallithea/controllers/admin/user_groups.py
@@ -88,8 +88,6 @@ class UserGroupsController(BaseControlle
return data
def index(self, format='html'):
- """GET /users_groups: All items in the collection"""
- # url('users_groups')
_list = UserGroup.query() \
.order_by(func.lower(UserGroup.users_group_name)) \
.all()
@@ -132,9 +130,6 @@ class UserGroupsController(BaseControlle
@HasPermissionAnyDecorator('hg.admin', 'hg.usergroup.create.true')
def create(self):
- """POST /users_groups: Create a new item"""
- # url('users_groups')
-
users_group_form = UserGroupForm()()
try:
form_result = users_group_form.to_python(dict(request.POST))
@@ -167,20 +162,10 @@ class UserGroupsController(BaseControlle
@HasPermissionAnyDecorator('hg.admin', 'hg.usergroup.create.true')
def new(self, format='html'):
- """GET /user_groups/new: Form to create a new item"""
- # url('new_users_group')
return render('admin/user_groups/user_group_add.html')
@HasUserGroupPermissionAnyDecorator('usergroup.admin')
def update(self, id):
- """PUT /user_groups/id: Update an existing item"""
- # Forms posted to this method should contain a hidden field:
- #
- # Or using helpers:
- # h.form(url('users_group', id=ID),
- # method='put')
- # url('users_group', id=ID)
-
c.user_group = UserGroup.get_or_404(id)
c.active = 'settings'
self.__load_data(id)
@@ -228,13 +213,6 @@ class UserGroupsController(BaseControlle
@HasUserGroupPermissionAnyDecorator('usergroup.admin')
def delete(self, id):
- """DELETE /user_groups/id: Delete an existing item"""
- # Forms posted to this method should contain a hidden field:
- #
- # Or using helpers:
- # h.form(url('users_group', id=ID),
- # method='delete')
- # url('users_group', id=ID)
usr_gr = UserGroup.get_or_404(id)
try:
UserGroupModel().delete(usr_gr)
@@ -254,9 +232,6 @@ class UserGroupsController(BaseControlle
@HasUserGroupPermissionAnyDecorator('usergroup.admin')
def edit(self, id, format='html'):
- """GET /user_groups/id/edit: Form to edit an existing item"""
- # url('edit_users_group', id=ID)
-
c.user_group = UserGroup.get_or_404(id)
c.active = 'settings'
self.__load_data(id)
@@ -322,11 +297,6 @@ class UserGroupsController(BaseControlle
@HasUserGroupPermissionAnyDecorator('usergroup.admin')
def delete_perms(self, id):
- """
- DELETE an existing repository group permission user
-
- :param group_name:
- """
try:
obj_type = request.POST.get('obj_type')
obj_id = None
@@ -404,9 +374,6 @@ class UserGroupsController(BaseControlle
@HasUserGroupPermissionAnyDecorator('usergroup.admin')
def update_default_perms(self, id):
- """PUT /users_perm/id: Update an existing item"""
- # url('users_group_perm', id=ID, method='put')
-
user_group = UserGroup.get_or_404(id)
try:
diff --git a/kallithea/controllers/admin/users.py b/kallithea/controllers/admin/users.py
--- a/kallithea/controllers/admin/users.py
+++ b/kallithea/controllers/admin/users.py
@@ -68,9 +68,6 @@ class UsersController(BaseController):
c.EXTERN_TYPE_INTERNAL = kallithea.EXTERN_TYPE_INTERNAL
def index(self, format='html'):
- """GET /users: All items in the collection"""
- # url('users')
-
c.users_list = User.query().order_by(User.username) \
.filter(User.username != User.DEFAULT_USER) \
.order_by(func.lower(User.username)) \
@@ -118,8 +115,6 @@ class UsersController(BaseController):
return render('admin/users/users.html')
def create(self):
- """POST /users: Create a new item"""
- # url('users')
c.default_extern_type = auth_internal.KallitheaAuthPlugin.name
c.default_extern_name = auth_internal.KallitheaAuthPlugin.name
user_model = UserModel()
@@ -150,20 +145,11 @@ class UsersController(BaseController):
raise HTTPFound(location=url('users'))
def new(self, format='html'):
- """GET /users/new: Form to create a new item"""
- # url('new_user')
c.default_extern_type = auth_internal.KallitheaAuthPlugin.name
c.default_extern_name = auth_internal.KallitheaAuthPlugin.name
return render('admin/users/user_add.html')
def update(self, id):
- """PUT /users/id: Update an existing item"""
- # Forms posted to this method should contain a hidden field:
- #
- # Or using helpers:
- # h.form(url('update_user', id=ID),
- # method='put')
- # url('user', id=ID)
user_model = UserModel()
user = user_model.get(id)
_form = UserForm(edit=True, old_data={'user_id': id,
@@ -203,13 +189,6 @@ class UsersController(BaseController):
raise HTTPFound(location=url('edit_user', id=id))
def delete(self, id):
- """DELETE /users/id: Delete an existing item"""
- # Forms posted to this method should contain a hidden field:
- #
- # Or using helpers:
- # h.form(url('delete_user', id=ID),
- # method='delete')
- # url('user', id=ID)
usr = User.get_or_404(id)
try:
UserModel().delete(usr)
@@ -245,8 +224,6 @@ class UsersController(BaseController):
return render('admin/users/user_edit.html')
def edit(self, id, format='html'):
- """GET /users/id/edit: Form to edit an existing item"""
- # url('edit_user', id=ID)
user = self._get_user_or_raise_if_default(id)
defaults = user.get_dict()
@@ -349,8 +326,6 @@ class UsersController(BaseController):
force_defaults=False)
def update_perms(self, id):
- """PUT /users_perm/id: Update an existing item"""
- # url('user_perm', id=ID, method='put')
user = self._get_user_or_raise_if_default(id)
try:
@@ -402,8 +377,6 @@ class UsersController(BaseController):
force_defaults=False)
def add_email(self, id):
- """POST /user_emails:Add an existing item"""
- # url('user_emails', id=ID, method='put')
user = self._get_user_or_raise_if_default(id)
email = request.POST.get('new_email')
user_model = UserModel()
@@ -422,8 +395,6 @@ class UsersController(BaseController):
raise HTTPFound(location=url('edit_user_emails', id=id))
def delete_email(self, id):
- """DELETE /user_emails_delete/id: Delete an existing item"""
- # url('user_emails_delete', id=ID, method='delete')
user = self._get_user_or_raise_if_default(id)
email_id = request.POST.get('del_email_id')
user_model = UserModel()
@@ -450,9 +421,6 @@ class UsersController(BaseController):
force_defaults=False)
def add_ip(self, id):
- """POST /user_ips:Add an existing item"""
- # url('user_ips', id=ID, method='put')
-
ip = request.POST.get('new_ip')
user_model = UserModel()
@@ -473,8 +441,6 @@ class UsersController(BaseController):
raise HTTPFound(location=url('edit_user_ips', id=id))
def delete_ip(self, id):
- """DELETE /user_ips_delete/id: Delete an existing item"""
- # url('user_ips_delete', id=ID, method='delete')
ip_id = request.POST.get('del_ip_id')
user_model = UserModel()
user_model.delete_extra_ip(id, ip_id)