Skip to content

Commit

Permalink
Merge pull request #22 from nebulabroadcast/develop
Browse files Browse the repository at this point in the history
Firefly 6.0.2
  • Loading branch information
martastain authored Sep 29, 2023
2 parents f66cea4 + 838428a commit e3d5368
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions firefly/modules/scheduler/calendar.py
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ def dropEvent(self, evt):
if move:
if not event.id:
# Create empty event. Event edit dialog is enforced.
self.exectute_event_dialog(start=drop_ts)
self.execute_event_dialog(start=drop_ts)
else:
# Moving existing event around. Instant save
if response := api.scheduler(
Expand All @@ -459,7 +459,7 @@ def dropEvent(self, evt):
self.calendar.dragging = False
self.update()

def exectute_event_dialog(self, **kwargs):
def execute_event_dialog(self, **kwargs):
kwargs["id_channel"] = self.id_channel
kwargs["date"] = self.calendar.date
QTimer.singleShot(100, functools.partial(self._execute_event_dialog, kwargs))
Expand Down
6 changes: 3 additions & 3 deletions firefly/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ def update(self, meta: dict[str, Any]) -> None:
self.meta.update(meta)

@property
def language(self):
def language(self) -> str:
"""Return the preferred language of the user."""
return "cs"

@property
def name(self):
def name(self) -> str:
return self.meta["login"]

def can(self, action: str, value: Any = None, anyval=False) -> bool:
def can(self, action: str, value: Any = None, anyval: bool = False) -> bool:
if self["is_admin"]:
return True
key = f"can/{action}"
Expand Down

0 comments on commit e3d5368

Please sign in to comment.