浏览代码

HUE-9674 [Django Upgrade] manager inheritance behavior set by Meta.manager_inheritance_from_future

ayush.goyal 4 年之前
父节点
当前提交
b554fc443d
共有 2 个文件被更改,包括 5 次插入1 次删除
  1. 4 0
      apps/oozie/src/oozie/models.py
  2. 1 1
      desktop/core/src/desktop/lib/fs/proxyfs.py

+ 4 - 0
apps/oozie/src/oozie/models.py

@@ -1721,6 +1721,8 @@ class Coordinator(Job):
     data_['cron_frequency'] = cron_frequency
     data_['cron_frequency'] = cron_frequency
     self.data = json.dumps(data_)
     self.data = json.dumps(data_)
 
 
+  class Meta(object):
+    manager_inheritance_from_future = True
 
 
 class DatasetManager(models.Manager):
 class DatasetManager(models.Manager):
   def can_read_or_exception(self, request, dataset_id):
   def can_read_or_exception(self, request, dataset_id):
@@ -1984,6 +1986,8 @@ class Bundle(Job):
     xml = zfile.read('bundle.xml')
     xml = zfile.read('bundle.xml')
     return xml, metadata
     return xml, metadata
 
 
+  class Meta(object):
+    manager_inheritance_from_future = True
 
 
 class HistoryManager(models.Manager):
 class HistoryManager(models.Manager):
   def create_from_submission(self, submission):
   def create_from_submission(self, submission):

+ 1 - 1
desktop/core/src/desktop/lib/fs/proxyfs.py

@@ -79,7 +79,7 @@ class ProxyFS(object):
       if not filebrowser_action:
       if not filebrowser_action:
         return True
         return True
       user = rewrite_user(User.objects.get(username=self.getuser()))
       user = rewrite_user(User.objects.get(username=self.getuser()))
-      return user.is_authenticated() and user.is_active and \
+      return user.is_authenticated and user.is_active and \
         (is_admin(user) or not filebrowser_action or user.has_hue_permission(action=filebrowser_action, app="filebrowser"))
         (is_admin(user) or not filebrowser_action or user.has_hue_permission(action=filebrowser_action, app="filebrowser"))
 
 
     except User.DoesNotExist:
     except User.DoesNotExist: