[FRI] v1.4.2_rdo7 to v1.9.1_rdo (Real branch) (RP-246) (RP-243)#12
Merged
JeanChristopheMorinRodeoFX merged 13 commits intomaster_rdofrom Mar 18, 2016
Merged
[FRI] v1.4.2_rdo7 to v1.9.1_rdo (Real branch) (RP-246) (RP-243)#12JeanChristopheMorinRodeoFX merged 13 commits intomaster_rdofrom
JeanChristopheMorinRodeoFX merged 13 commits intomaster_rdofrom
Conversation
…on in list view (RPS-243)
…pp settings (RPS-243)
|
|
Author
|
There is an error with this branch: // Error: Shotgun: An exception was raised from Toolkit
__init__() takes exactly 3 arguments (2 given)
The current environment is shot_and_asset.
Code Traceback:
File "/rdo/rodeo/repositories/tank/_sandbox/v0.16/studio/install/engines/app_store/tk-maya/v0.5.4/python/tk_maya/menu_generation.py", line 318, in _execute_within_exception_trap
self.callback()
File "/mnt/users/jcmorin/rdoenv/tank/apps/tk-multi-loader2/app.py", line 32, in <lambda>
cb = lambda : tk_multi_loader.show_dialog(self)
File "/mnt/users/jcmorin/rdoenv/tank/apps/tk-multi-loader2/python/tk_multi_loader/__init__.py", line 42, in show_dialog
w = app.engine.show_dialog(ui_title, app, AppDialog, action_manager)
File "/rdo/rodeo/repositories/tank/_sandbox/v0.16/studio/install/core/python/tank/platform/engine.py", line 946, in show_dialog
dialog, widget = self._create_dialog_with_widget(title, bundle, widget_class, *args, **kwargs)
File "/rdo/rodeo/repositories/tank/_sandbox/v0.16/studio/install/core/python/tank/platform/engine.py", line 847, in _create_dialog_with_widget
widget = self._create_widget(widget_class, *args, **kwargs)
File "/rdo/rodeo/repositories/tank/_sandbox/v0.16/studio/install/core/python/tank/platform/engine.py", line 825, in _create_widget
widget = derived_widget_class(*args, **kwargs)
File "/mnt/users/jcmorin/rdoenv/tank/apps/tk-multi-loader2/python/tk_multi_loader/dialog.py", line 281, in __init__
self._add_rdo_publish_search(hlayout)
File "/mnt/users/jcmorin/rdoenv/tank/apps/tk-multi-loader2/python/tk_multi_loader/dialog.py", line 1248, in _add_rdo_publish_search
search = SearchWidget(self) |
Author
|
Error fixed! |
| small_text = "<span style='color:#2C93E2'>%s</span> by %s at %s" % (pub_type_str, | ||
| author_str, | ||
| date_str) | ||
| small_text += "<br><b>Description:</b> %s" % sg_data.get("description") or "No description given" |
There was a problem hiding this comment.
Looks like some parenthesis are missing here, I'm seeing some "Description: None"
Should be
small_text += "<br><b>Description:</b> %s" % (sg_data.get("description") or "No description given")
|
👍 |
|
Julien says 👍 too |
JeanChristopheMorinRodeoFX
added a commit
that referenced
this pull request
Mar 18, 2016
[FRI] v1.4.2_rdo7 to v1.9.1_rdo (Real branch) (RP-246) (RP-243)
vfleuryrodeofx
pushed a commit
that referenced
this pull request
Apr 22, 2022
Introduces a new list mode in the loader which is a more compact representation of publishes. The delegate widgets have also been moved into the loader so that it no longer depends on the standard widgets in the qtwidgets framework. This is a tweak to make it easier for the loader to switch to the v3 qtwidgets framework when that is released as part of the file manager changes. Closes #12
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR #11 was not meant to be merged in master_rdo. So Created a new branch from master_rdo, then cherry-picked the commits from #10 and #11 to get all my changes. Should now be good.
That will allow you to see a diff of v1.9.1 <> v1.9.1_rdo1 and v1.4.2 <> v1.4.2_rdo3.
First meld instance will allow you to see rdo cahnges in the new app, and the second meld instance wil allow you to see rdo changes in v1.4.2.
So you can see if our changes are the same in the new app than in the old app, without seeing new code from Shotgun.