Marino Faggiana 6 лет назад
Родитель
Сommit
8427cb7a4a
1 измененных файлов с 4 добавлено и 0 удалено
  1. 4 0
      iOSClient/Trash/NCTrash.swift

+ 4 - 0
iOSClient/Trash/NCTrash.swift

@@ -15,6 +15,7 @@ class NCTrash: UIViewController , UICollectionViewDataSource, UICollectionViewDe
     
     
     let appDelegate = UIApplication.shared.delegate as! AppDelegate
     let appDelegate = UIApplication.shared.delegate as! AppDelegate
     var path = ""
     var path = ""
+    var titleCurrentFolder = NSLocalizedString("_trash_view_", comment: "")
     var itemHeight: CGFloat = 60
     var itemHeight: CGFloat = 60
     var datasource = [tableTrash]()
     var datasource = [tableTrash]()
 
 
@@ -30,6 +31,8 @@ class NCTrash: UIViewController , UICollectionViewDataSource, UICollectionViewDe
     override func viewWillAppear(_ animated: Bool) {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         super.viewWillAppear(animated)
         
         
+        self.navigationItem.title = titleCurrentFolder
+
         if path == "" {
         if path == "" {
             let userID = (appDelegate.activeUserID as NSString).addingPercentEncoding(withAllowedCharacters: NSCharacterSet.urlFragmentAllowed)
             let userID = (appDelegate.activeUserID as NSString).addingPercentEncoding(withAllowedCharacters: NSCharacterSet.urlFragmentAllowed)
             path = k_dav + "/trashbin/" + userID! + "/trash/"
             path = k_dav + "/trashbin/" + userID! + "/trash/"
@@ -114,6 +117,7 @@ class NCTrash: UIViewController , UICollectionViewDataSource, UICollectionViewDe
         
         
             let ncTrash:NCTrash = UIStoryboard(name: "NCTrash", bundle: nil).instantiateInitialViewController() as! NCTrash
             let ncTrash:NCTrash = UIStoryboard(name: "NCTrash", bundle: nil).instantiateInitialViewController() as! NCTrash
             ncTrash.path = tableTrash.filePath + tableTrash.fileName
             ncTrash.path = tableTrash.filePath + tableTrash.fileName
+            ncTrash.titleCurrentFolder = tableTrash.trashbinFileName
             self.navigationController?.pushViewController(ncTrash, animated: true)
             self.navigationController?.pushViewController(ncTrash, animated: true)
         }
         }
     }
     }