Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix GUI not updating bugs #1180

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cuegui/cuegui/JobMonitorTree.py
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ def _getUpdate(self):
# an empty list for the id argument!
if not ids:
continue
tmp = opencue.api.getJobs(id=ids, all=True)
tmp = opencue.api.getJobs(id=ids, include_finished=True)
self.__dependentJobs[job] = tmp

if self.__loadMine:
Expand Down
20 changes: 10 additions & 10 deletions cuegui/cuegui/plugins/MonitorJobsPlugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,17 +199,17 @@ def _regexLoadJobsHandle(self):

self.jobMonitor.removeAllItems()

if cuegui.Utils.isStringId(substring):
# If a uuid is provided, load it
self.jobMonitor.addJob(substring)
elif load_finished_jobs or re.search(
if substring:
if cuegui.Utils.isStringId(substring):
# If a uuid is provided, load it
self.jobMonitor.addJob(substring)
elif load_finished_jobs or re.search(
r"^([a-z0-9_]+)\-([a-z0-9\.]+)\-", substring, re.IGNORECASE):
# If show and shot is provided, or if "load finished" checkbox is checked, load all jobs
for job in opencue.api.getJobs(regex=[substring], include_finished=True):
self.jobMonitor.addJob(job)
else:
# Otherwise, just load current matching jobs (except for the empty string)
if substring:
# Load all ff show and shot is provided or if "load finished" checkbox is checked
for job in opencue.api.getJobs(regex=[substring], include_finished=True):
self.jobMonitor.addJob(job)
else:
# Otherwise, just load current matching jobs (except for the empty string)
for job in opencue.api.getJobs(regex=[substring]):
self.jobMonitor.addJob(job)

Expand Down
1 change: 1 addition & 0 deletions pycue/opencue/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ def getJobs(**options):
- show: show names - list
- shot: shot names - list
- user: user names - list
- include_finished - bool

:rtype: list
:return: a list of Job objects
Expand Down
Loading