diff --git a/entities.py b/entities.py index 306f23768f4a04a8e60f9e3007da813f1c8566cd_ZW50aXRpZXMucHk=..4a0c6101be419bc6513992d4096c0131619d630f_ZW50aXRpZXMucHk= 100644 --- a/entities.py +++ b/entities.py @@ -17,6 +17,4 @@ return u'%s (%s)' % (self.title, self.url) def actual_url(self): - if not self.embed: - return self.url - return self._cw.build_url('embed', url=self.url, rql=self._cw.form.get('rql') or u'') + return self.url diff --git a/migration/1.7.0_Any.py b/migration/1.7.0_Any.py new file mode 100644 index 0000000000000000000000000000000000000000..4a0c6101be419bc6513992d4096c0131619d630f_bWlncmF0aW9uLzEuNy4wX0FueS5weQ== --- /dev/null +++ b/migration/1.7.0_Any.py @@ -0,0 +1,1 @@ +drop_attribute('Link', 'embed') diff --git a/schema.py b/schema.py index 306f23768f4a04a8e60f9e3007da813f1c8566cd_c2NoZW1hLnB5..4a0c6101be419bc6513992d4096c0131619d630f_c2NoZW1hLnB5 100644 --- a/schema.py +++ b/schema.py @@ -6,8 +6,6 @@ title = String(required=True, fulltextindexed=True, maxsize=256) url = String(required=True, fulltextindexed=True, maxsize=512, description=_("link's url")) - embed = Boolean(default=False, - description=_("generate links to embed the page by default?")) description = RichString(fulltextindexed=True, description=_("description of the linked page's content")) @@ -11,7 +9,3 @@ description = RichString(fulltextindexed=True, description=_("description of the linked page's content")) -class embed(RelationType): - __permissions__ = {'read': ('managers', 'users', 'guests'), - 'update': ('managers',), - } diff --git a/test/unittest_link.py b/test/unittest_link.py index 306f23768f4a04a8e60f9e3007da813f1c8566cd_dGVzdC91bml0dGVzdF9saW5rLnB5..4a0c6101be419bc6513992d4096c0131619d630f_dGVzdC91bml0dGVzdF9saW5rLnB5 100644 --- a/test/unittest_link.py +++ b/test/unittest_link.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from cubicweb.devtools.testlib import CubicWebTC -from cubicweb.web.views import uicfg, actions, embedding +from cubicweb.web.views import uicfg, actions from cubes.link import views @@ -23,9 +23,9 @@ actions.AddRelatedActions, actions.DeleteAction, actions.CopyAction, - embedding.EmbedAction]) + ]) def test_relations_by_category(self): def rbc(iterable): return [(rschema.type, x) for rschema, tschemas, x in iterable] e = self.vreg["etypes"].etype_class('Link')(self.request()) @@ -27,8 +27,7 @@ def test_relations_by_category(self): def rbc(iterable): return [(rschema.type, x) for rschema, tschemas, x in iterable] e = self.vreg["etypes"].etype_class('Link')(self.request()) - # we should only see embed when we are in the managers group self.assertEqual(rbc(afs.relations_by_section(e, 'main', 'attributes', 'update')), [('title', 'subject'), ('url', 'subject'), @@ -33,6 +32,5 @@ self.assertEqual(rbc(afs.relations_by_section(e, 'main', 'attributes', 'update')), [('title', 'subject'), ('url', 'subject'), - ('embed', 'subject'), ('description', 'subject')]) self.create_user(self.session, 'toto') self.login('toto') diff --git a/views.py b/views.py index 306f23768f4a04a8e60f9e3007da813f1c8566cd_dmlld3MucHk=..4a0c6101be419bc6513992d4096c0131619d630f_dmlld3MucHk= 100644 --- a/views.py +++ b/views.py @@ -12,8 +12,5 @@ from cubicweb.predicates import is_instance from cubicweb.view import EntityView from cubicweb.web import formwidgets -from cubicweb.web.views import uicfg, primary, baseviews, xbel, bookmark, embedding - -class LinkIEmbedableAdapter(embedding.IEmbedableAdapter): - __select__ = is_instance('Link') +from cubicweb.web.views import primary, baseviews, xbel, bookmark @@ -19,5 +16,2 @@ - def embeded_url(self): - """embed action interface""" - return self.entity.url @@ -23,5 +17,5 @@ -for attr in ('title', 'url', 'embed'): +for attr in ('title', 'url'): uicfg.primaryview_section.tag_attribute(('Link', attr), 'hidden') uicfg.autoform_field_kwargs.tag_attribute(('Link', 'url'),