diff options
Diffstat (limited to 'mediagoblin/plugins/archivalook')
| -rw-r--r-- | mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html | 8 | ||||
| -rw-r--r-- | mediagoblin/plugins/archivalook/tools.py | 15 |
2 files changed, 11 insertions, 12 deletions
diff --git a/mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html b/mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html index c5b8a7d6..942a888b 100644 --- a/mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html +++ b/mediagoblin/plugins/archivalook/templates/archivalook/feature_media_sidebar.html @@ -21,7 +21,7 @@ {% if not media_feature %} <a href="{{ request.urlgen( 'mediagoblin.user_pages.media_feature', - user=media.get_uploader.username, + user=media.get_actor.username, media=media.slug_or_id) }}" class="button_action" id="button_featuremedia" title="{% trans %} Feature Media {% endtrans %}"> @@ -29,7 +29,7 @@ Feature Media {% endtrans %}"> {% else %} <a href="{{ request.urlgen( 'mediagoblin.user_pages.media_unfeature', - user=media.get_uploader.username, + user=media.get_actor.username, media=media.slug_or_id) }}" class="button_action" id="button_unfeaturemedia" title="{% trans %} Unfeature Media {% endtrans %}"> @@ -37,7 +37,7 @@ Unfeature Media {% endtrans %}"> {% if not media_feature.display_type == 'primary' %} <a href="{{ request.urlgen( 'mediagoblin.user_pages.feature_promote', - user=media.get_uploader.username, + user=media.get_actor.username, media=media.slug_or_id) }}" class="button_action" id="button_promotefeature" title="{% trans %} Promote Feature {% endtrans %}"> @@ -45,7 +45,7 @@ Promote Feature {% endtrans %}"> {% endif %}{% if not media_feature.display_type == 'tertiary' %} <a href="{{ request.urlgen( 'mediagoblin.user_pages.feature_demote', - user=media.get_uploader.username, + user=media.get_actor.username, media=media.slug_or_id) }}" class="button_action" id="button_demotefeature" title="{% trans %} Demote Feature {% endtrans %}"> diff --git a/mediagoblin/plugins/archivalook/tools.py b/mediagoblin/plugins/archivalook/tools.py index b495624c..ad2eee5f 100644 --- a/mediagoblin/plugins/archivalook/tools.py +++ b/mediagoblin/plugins/archivalook/tools.py @@ -13,10 +13,9 @@ # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. - import six -from mediagoblin.db.models import MediaEntry, User +from mediagoblin.db.models import MediaEntry, User, LocalUser from mediagoblin.plugins.archivalook.models import FeaturedMedia from mediagoblin.tools.translate import lazy_pass_to_ugettext as _ from mediagoblin.plugins.archivalook.models import FeaturedMedia @@ -35,11 +34,12 @@ def get_media_entry_from_uploader_slug(uploader_username, slug): :returns media A MediaEntry object or None if no entry matches the specifications. """ - uploader = User.query.filter( - User.username == uploader_username).first() + uploader = LocalUser.query.filter( + LocalUser.username==uploader_username + ).first() media = MediaEntry.query.filter( - MediaEntry.get_uploader == uploader ).filter( - MediaEntry.slug == slug).first() + MediaEntry.get_actor == uploader ).filter( + MediaEntry.slug == slug).first() return media @@ -141,7 +141,7 @@ def create_featured_media_textbox(): for feature in feature_list: media_entry = feature.media_entry output_text += u'/u/{uploader_username}/m/{media_slug}/\n'.format( - uploader_username = media_entry.get_uploader.username, + uploader_username = media_entry.get_actor.username, media_slug = media_entry.slug) @@ -292,4 +292,3 @@ def demote_feature(media_entry): elif target_feature.display_type == u'primary': target_feature.display_type = u'secondary' target_feature.save() - |