diff --git a/pym/cl_fill_desktop.py b/pym/cl_fill_desktop.py index 3d01071..50428d8 100644 --- a/pym/cl_fill_desktop.py +++ b/pym/cl_fill_desktop.py @@ -30,28 +30,25 @@ class fillVars(): def get_cl_desktop_install_action(self): """переключатель для шаблонов инсталяции и удаления программы""" ret = "" - if "calculate-desktop" in self.GetList("cl_merges"): - action = self.Get("cl_action") - if action in ("install","merge"): - ret = "up" - elif action == "uninstall": - ret = "down" + action = self.Get("cl_action") + if action in ("install","merge"): + ret = "up" + elif action == "uninstall": + ret = "down" return ret def get_cl_desktop_merge_action(self): """переключатель для шаблонов merge""" ret = "" - if "calculate-desktop" in self.GetList("cl_merges"): - action = self.Get("cl_action") - if action in ("install","uninstall","merge"): - ret = "up" + action = self.Get("cl_action") + if action in ("install","uninstall","merge"): + ret = "up" return ret def get_cl_desktop_desktop_action(self): """переключатель для шаблонов создания пользовательского профиля""" ret = "" - if "calculate-desktop" in self.GetList("cl_merges"): - action = self.Get("cl_action") - if action in ("desktop",): - ret = "up" - return ret \ No newline at end of file + action = self.Get("cl_action") + if action in ("desktop",): + ret = "up" + return ret