engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

grids: columns and sorting fixes

Browse source
This commit is contained in:
Marcin Kuzminski 2019-12-19 15:27:28 +01:00
parent 75262fdc8e
commit 7260aed821
9 changed files with 25 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rhodecode/apps/admin/views/repo_groups.py
View file

@ -111,9 +111,9 @@ class AdminRepoGroupsView(BaseAppView, DataGridAppView):
def repo_group_list_data(self):
self.load_default_context()
column_map = {
'name_raw': 'group_name_hash',
'name': 'group_name_hash',
'desc': 'group_description',
'last_change_raw': 'updated_on',
'last_change': 'updated_on',
'top_level_repos': 'repos_total',
'owner': 'user_username',
}
@ -223,9 +223,8 @@ class AdminRepoGroupsView(BaseAppView, DataGridAppView):
row = {
"menu": quick_menu(repo_gr.group_name),
"name": repo_group_lnk(repo_gr.group_name),
"name_raw": repo_gr.group_name,
"last_change": last_change(repo_gr.updated_on),
"last_change_raw": datetime_to_time(repo_gr.updated_on),
"last_changeset": "",
"last_changeset_raw": "",

4
rhodecode/apps/admin/views/repositories.py
View file

@ -81,9 +81,9 @@ class AdminReposView(BaseAppView, DataGridAppView):
def repository_list_data(self):
self.load_default_context()
column_map = {
'name_raw': 'repo_name',
'name': 'repo_name',
'desc': 'description',
'last_change_raw': 'updated_on',
'last_change': 'updated_on',
'owner': 'user_username',
}
draw, start, limit = self._extract_chunk(self.request)

1
rhodecode/apps/admin/views/user_groups.py
View file

@ -171,7 +171,6 @@ class AdminUserGroupsView(BaseAppView, DataGridAppView):
for user_gr in auth_user_group_list:
row = {
"users_group_name": user_group_name(user_gr.users_group_name),
"name_raw": h.escape(user_gr.users_group_name),
"description": h.escape(user_gr.user_group_description),
"members": user_gr.member_count,
# NOTE(marcink): because of advanced query we

8
rhodecode/apps/home/views.py
View file

@ -685,9 +685,9 @@ class HomeView(BaseAppView, DataGridAppView):
def _main_page_repo_groups_data(self, repo_group_id):
column_map = {
'name_raw': 'group_name_hash',
'name': 'group_name_hash',
'desc': 'group_description',
'last_change_raw': 'updated_on',
'last_change': 'updated_on',
'owner': 'user_username',
}
draw, start, limit = self._extract_chunk(self.request)
@ -700,9 +700,9 @@ class HomeView(BaseAppView, DataGridAppView):
def _main_page_repos_data(self, repo_group_id):
column_map = {
'name_raw': 'repo_name',
'name': 'repo_name',
'desc': 'description',
'last_change_raw': 'updated_on',
'last_change': 'updated_on',
'owner': 'user_username',
}
draw, start, limit = self._extract_chunk(self.request)

6
rhodecode/model/repo.py
View file

@ -251,18 +251,16 @@ class RepoModel(BaseModel):
# NOTE(marcink): because we use only raw column we need to load it like that
changeset_cache = Repository._load_changeset_cache(
repo.repo_id, repo._changeset_cache)
last_commit_change = Repository._load_commit_change(changeset_cache)
row = {
"menu": quick_menu(repo.repo_name),
"name": repo_lnk(repo.repo_name, repo.repo_type, repo.repo_state,
repo.private, repo.archived, repo.fork),
"name_raw": repo.repo_name.lower(),
"desc": desc(repo.description),
"last_change": last_change(last_commit_change),
"last_change_raw": datetime_to_time(last_commit_change),
"last_change": last_change(repo.updated_on),
"last_changeset": last_rev(repo.repo_name, changeset_cache),
"last_changeset_raw": changeset_cache.get('revision'),

1
rhodecode/model/repo_group.py
View file

@ -749,7 +749,6 @@ class RepoGroupModel(BaseModel):
"name_raw": group.group_name,
"last_change": last_change(last_commit_change),
"last_change_raw": datetime_to_time(last_commit_change),
"last_changeset": "",
"last_changeset_raw": "",

4
rhodecode/templates/admin/repo_groups/repo_groups.mako
View file

@ -71,12 +71,12 @@ $(document).ready(function() {
order: [[ 0, "asc" ]],
columns: [
{ data: {"_": "name",
"sort": "name_raw"}, title: "${_('Name')}", className: "td-componentname" },
"sort": "name"}, title: "${_('Name')}", className: "td-componentname" },
{ data: 'menu', "bSortable": false, className: "quick_repo_menu" },
{ data: {"_": "desc",
"sort": "desc"}, title: "${_('Description')}", className: "td-description" },
{ data: {"_": "last_change",
"sort": "last_change_raw",
"sort": "last_change",
"type": Number}, title: "${_('Last Change')}", className: "td-time" },
{ data: {"_": "top_level_repos",
"sort": "top_level_repos"}, title: "${_('Number of top level repositories')}" },

4
rhodecode/templates/admin/repos/repos.mako
View file

@ -72,7 +72,7 @@ $(document).ready(function() {
{
data: {
"_": "name",
"sort": "name_raw"
"sort": "name"
}, title: "${_('Name')}", className: "td-componentname"
},
{
@ -86,7 +86,7 @@ $(document).ready(function() {
{
data: {
"_": "last_change",
"sort": "last_change_raw",
"sort": "last_change",
"type": Number
}, title: "${_('Last Change')}", className: "td-time"
},

18
rhodecode/templates/index_base.mako
View file

@ -58,10 +58,12 @@
{
data: {
"_": "name",
"sort": "name_raw"
"sort": "name"
}, title: "${_('Name')}", className: "truncate-wrap td-grid-name"
},
{data: 'menu', "bSortable": false, className: "quick_repo_menu"},
{
data: 'menu', "bSortable": false, className: "quick_repo_menu"
},
{
data: {
"_": "desc",
@ -71,7 +73,7 @@
{
data: {
"_": "last_change",
"sort": "last_change_raw",
"sort": "last_change",
"type": Number
}, title: "${_('Last Change')}", className: "td-time"
},
@ -80,7 +82,7 @@
"_": "last_changeset",
"sort": "last_changeset_raw",
"type": Number
}, title: "", className: "td-hash"
}, title: "", className: "td-hash", orderable: false
},
{
data: {
@ -147,7 +149,7 @@
{
data: {
"_": "name",
"sort": "name_raw"
"sort": "name"
}, title: "${_('Name')}", className: "truncate-wrap td-grid-name"
},
{
@ -162,16 +164,16 @@
{
data: {
"_": "last_change",
"sort": "last_change_raw",
"sort": "last_change",
"type": Number
}, title: "${_('Last Change')}", className: "td-time", orderable: false
}, title: "${_('Last Change')}", className: "td-time"
},
{
data: {
"_": "last_changeset",
"sort": "last_changeset_raw",
"type": Number
}, title: "${_('Commit')}", className: "td-hash"
}, title: "${_('Commit')}", className: "td-hash", orderable: false
},
{
data: {