|
@@ -1,27 +1,17 @@
|
1
|
1
|
# -*- coding: utf-8 -*-
|
2
|
2
|
from contextlib import contextmanager
|
3
|
|
-
|
4
|
3
|
import os
|
5
|
|
-
|
6
|
|
-from operator import itemgetter, not_
|
7
|
|
-
|
8
|
|
-import transaction
|
9
|
|
-from sqlalchemy import func
|
10
|
|
-from sqlalchemy.orm import Query
|
11
|
|
-
|
12
|
|
-from tracim.models.context_models import ContentInContext
|
13
|
|
-
|
14
|
|
-__author__ = 'damien'
|
15
|
|
-
|
16
|
4
|
import datetime
|
17
|
5
|
import re
|
18
|
6
|
import typing
|
|
7
|
+from operator import itemgetter
|
|
8
|
+from operator import not_
|
19
|
9
|
|
20
|
|
-from tracim.lib.utils.translation import fake_translator as _
|
21
|
|
-
|
|
10
|
+import transaction
|
|
11
|
+from sqlalchemy import func
|
|
12
|
+from sqlalchemy.orm import Query
|
22
|
13
|
from depot.manager import DepotManager
|
23
|
14
|
from depot.io.utils import FileIntent
|
24
|
|
-
|
25
|
15
|
import sqlalchemy
|
26
|
16
|
from sqlalchemy.orm import aliased
|
27
|
17
|
from sqlalchemy.orm import joinedload
|
|
@@ -31,6 +21,7 @@ from sqlalchemy import desc
|
31
|
21
|
from sqlalchemy import distinct
|
32
|
22
|
from sqlalchemy import or_
|
33
|
23
|
from sqlalchemy.sql.elements import and_
|
|
24
|
+
|
34
|
25
|
from tracim.lib.utils.utils import cmp_to_key
|
35
|
26
|
from tracim.lib.core.notifications import NotifierFactory
|
36
|
27
|
from tracim.exceptions import SameValueError
|
|
@@ -46,6 +37,11 @@ from tracim.models.data import NodeTreeItem
|
46
|
37
|
from tracim.models.data import RevisionReadStatus
|
47
|
38
|
from tracim.models.data import UserRoleInWorkspace
|
48
|
39
|
from tracim.models.data import Workspace
|
|
40
|
+from tracim.lib.utils.translation import fake_translator as _
|
|
41
|
+from tracim.models.context_models import ContentInContext
|
|
42
|
+
|
|
43
|
+
|
|
44
|
+__author__ = 'damien'
|
49
|
45
|
|
50
|
46
|
|
51
|
47
|
def compare_content_for_sorting_by_type_and_name(
|