Guénaël Muller 7 лет назад
Родитель
Сommit
6e9485c834
2 измененных файлов: 6 добавлений и 6 удалений
  1. 4 4
      tracim/lib/core/content.py
  2. 2 2
      tracim/models/data.py

+ 4 - 4
tracim/lib/core/content.py Просмотреть файл

161
             self._show_deleted = previous_show_deleted
161
             self._show_deleted = previous_show_deleted
162
             self._show_temporary = previous_show_temporary
162
             self._show_temporary = previous_show_temporary
163
 
163
 
164
-    def get_content_in_context(self, content: Content):
164
+    def get_content_in_context(self, content: Content) -> ContentInContext:
165
         return ContentInContext(content, self._session, self._config)
165
         return ContentInContext(content, self._session, self._config)
166
 
166
 
167
-    def get_revision_in_context(self, revision: ContentRevisionRO):
167
+    def get_revision_in_context(self, revision: ContentRevisionRO) -> RevisionInContext:  # nopep8
168
         # TODO - G.M - 2018-06-173 - create revision in context object
168
         # TODO - G.M - 2018-06-173 - create revision in context object
169
         return RevisionInContext(revision, self._session, self._config)
169
         return RevisionInContext(revision, self._session, self._config)
170
     
170
     
171
-    def get_revision_join(self) -> sqlalchemy.sql.elements.BooleanClauseList:
171
+    def _get_revision_join(self) -> sqlalchemy.sql.elements.BooleanClauseList:
172
         """
172
         """
173
         Return the Content/ContentRevision query join condition
173
         Return the Content/ContentRevision query join condition
174
         :return: Content/ContentRevision query join condition
174
         :return: Content/ContentRevision query join condition
187
         :return: Content/ContentRevision Query
187
         :return: Content/ContentRevision Query
188
         """
188
         """
189
         return self._session.query(Content)\
189
         return self._session.query(Content)\
190
-            .join(ContentRevisionRO, self.get_revision_join())
190
+            .join(ContentRevisionRO, self._get_revision_join())
191
 
191
 
192
     @classmethod
192
     @classmethod
193
     def sort_tree_items(
193
     def sort_tree_items(

+ 2 - 2
tracim/models/data.py Просмотреть файл

812
     # QUERY CONTENTS
812
     # QUERY CONTENTS
813
 
813
 
814
     To query contents you will need to join your content query with ContentRevisionRO. Join
814
     To query contents you will need to join your content query with ContentRevisionRO. Join
815
-    condition is available at tracim.lib.content.ContentApi#get_revision_join:
815
+    condition is available at tracim.lib.content.ContentApi#_get_revision_join:
816
 
816
 
817
-    content = DBSession.query(Content).join(ContentRevisionRO, ContentApi.get_revision_join())
817
+    content = DBSession.query(Content).join(ContentRevisionRO, ContentApi._get_revision_join())
818
                   .filter(Content.label == 'foo')
818
                   .filter(Content.label == 'foo')
819
                   .one()
819
                   .one()
820
 
820