fixed conflicts

[meabook] / controller.py

diff --git a/controller.py b/controller.py
index baab788..1505a67 100644 (file)
--- a/controller.py
+++ b/controller.py
@@ -3,7 +3,9 @@ Meabook controller class
 """
 
 from meabook.constants import *
-from gettext import gettext as _
+import gettext
+
+_ = gettext.gettext
 
 
 class MeabookController:
@@ -23,7 +25,7 @@ class MeabookController:
         """Gets from model items with selected level."""
 
         folders_list = list(self.get_all_folders(parent))
-        files_list = [(fields['cn'], int_name, TYPE_FILE) for int_name, \
+        files_list = [(fields['cn'], internal_name, 'f') for internal_name, \
             fields in self.model.get_files(['cn'], parent).items()]
         return folders_list + files_list
 
@@ -48,13 +50,14 @@ class MeabookController:
     def get_all_folders(self, parent=0):
         """Gets all filials."""
 
-        return [(name, internal_name, TYPE_DIRECTORY) for name, internal_name \
-            in self.model.get_folders(parent)]
+        return [(name, internal_name, 'd') for name, internal_name in \
+            self.model.get_folders(parent)]
 
     def get_all_subfolders(self):
         """Gets all departments."""
 
-        return self.get_all_folders(parent=None)
+        return [(name, internal_name, 'd') for name, internal_name in \
+            self.model.get_folders()]
 
     def get_all_files(self):
         """Gets all peoples."""
@@ -91,6 +94,11 @@ class MeabookController:
 
         self.view.create_configuration_dialog(self, self.config)
 
+    def show_search_dialog(self):
+        """Shows view Search Dialog."""
+
+        self.view.create_search_dialog(self)
+
     def show_import_dialog(self):
         """Shows view IMport Dialog."""