You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bloodhound.apache.org by ah...@apache.org on 2013/09/16 22:08:11 UTC

svn commit: r1523785 - in /bloodhound/branches/bep_0007_embeddable_objects: bloodhound_dashboard/bhdashboard/widgets/templates/ bloodhound_embedding_plugin/bhembedding/ bloodhound_embedding_plugin/bhembedding/tests/ bloodhound_multiproduct/multiproduct...

Author: ahorincar
Date: Mon Sep 16 20:08:10 2013
New Revision: 1523785

URL: http://svn.apache.org/r1523785
Log:
Fixed bug in the embedding of queries, added the embed plugin to requirements-dev.txt and added IRequestFilter methods for embedding

Removed:
    bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/tests/
Modified:
    bloodhound/branches/bep_0007_embeddable_objects/bloodhound_dashboard/bhdashboard/widgets/templates/widget_product.html
    bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/api.py
    bloodhound/branches/bep_0007_embeddable_objects/bloodhound_multiproduct/multiproduct/ticket/query.py
    bloodhound/branches/bep_0007_embeddable_objects/bloodhound_multiproduct/multiproduct/web_ui.py
    bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_milestone_view.html
    bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_query.html
    bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_ticket.html
    bloodhound/branches/bep_0007_embeddable_objects/installer/requirements-dev.txt
    bloodhound/branches/bep_0007_embeddable_objects/trac/trac/ticket/api.py
    bloodhound/branches/bep_0007_embeddable_objects/trac/trac/ticket/query.py
    bloodhound/branches/bep_0007_embeddable_objects/trac/trac/ticket/roadmap.py
    bloodhound/branches/bep_0007_embeddable_objects/trac/trac/ticket/web_ui.py

Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_dashboard/bhdashboard/widgets/templates/widget_product.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_dashboard/bhdashboard/widgets/templates/widget_product.html?rev=1523785&r1=1523784&r2=1523785&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_dashboard/bhdashboard/widgets/templates/widget_product.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_dashboard/bhdashboard/widgets/templates/widget_product.html Mon Sep 16 20:08:10 2013
@@ -77,46 +77,50 @@
             </py:otherwise>
           </py:choose>
 
+
           <!-- Embedding plugin -->
-          <a id="embed-btn-${i}" href="#embed-modal-${i}" role="button" class="btn" data-toggle="modal">Embed Product</a>
-          <!-- Embedding Modal -->
-          <div id="embed-modal-${i}" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-            <div class="modal-header">
-              <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-              <h3 id="myModalLabel">Embed this Product</h3>
-            </div>
-            <div class="modal-body">
-              <textarea id="embed-textarea-${i}" rows="3" class="input-block-level" style="width:100%;min-width:100%;max-width:100%;">
-              </textarea>
-            </div>
-            <div class="modal-footer">
-              <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+          <span py:if="'PRODUCT_EMBED' in perm(p.resource) and bhembedding">
+            <a id="embed-btn-${i}" href="#embed-modal-${i}" role="button" class="btn" data-toggle="modal">Embed Product</a>
+
+            <!-- Embedding Modal -->
+            <div id="embed-modal-${i}" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+              <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h3 id="myModalLabel">Embed this Product</h3>
+              </div>
+              <div class="modal-body">
+                <textarea id="embed-textarea-${i}" rows="3" class="input-block-level" style="width:100%;min-width:100%;max-width:100%;">
+                </textarea>
+              </div>
+              <div class="modal-footer">
+                <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+              </div>
             </div>
-          </div>
 
-          <script language="JavaScript" type="text/javascript">
-            function make_iframe(src) {
-              iframe = document.createElement("iframe");
-              var root = get_root();
-              $(iframe).attr("src", root + src);
-              $(iframe).attr("width", "480");
-              $(iframe).attr("height", "300");
-              $(iframe).attr("frameborder", "0");
-              $(iframe).attr("scrolling", "yes");
-              return $(iframe).get(0).outerHTML;
-           }
-
-
-           // p.prefix doesn't have any value
-           $('#embed-btn-${i}').click(function() {
-             $('#embed-textarea-${i}').val(make_iframe('${href.embed("products", p.prefix)}'));
-           });
-
-           function get_root() {
-            var root = window.location.protocol + '//' + window.location.host;
-            return root;
-           }
-          </script>
+            <script language="JavaScript" type="text/javascript">
+              function make_iframe(src) {
+                iframe = document.createElement("iframe");
+                var root = get_root();
+                $(iframe).attr("src", root + src);
+                $(iframe).attr("width", "480");
+                $(iframe).attr("height", "300");
+                $(iframe).attr("frameborder", "0");
+                $(iframe).attr("scrolling", "yes");
+                return $(iframe).get(0).outerHTML;
+             }
+
+
+             // p.prefix doesn't have any value
+             $('#embed-btn-${i}').click(function() {
+               $('#embed-textarea-${i}').val(make_iframe('${href.embed("products", p.prefix)}'));
+             });
+
+             function get_root() {
+              var root = window.location.protocol + '//' + window.location.host;
+              return root;
+             }
+            </script>
+          </span>
 
         </div>
       </div>

Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/api.py
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/api.py?rev=1523785&r1=1523784&r2=1523785&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/api.py (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_embedding_plugin/bhembedding/api.py Mon Sep 16 20:08:10 2013
@@ -1,32 +1,26 @@
 import re
 import pkg_resources
+import urllib
 from datetime import datetime, date, time
 
-from trac.core import *
+from trac.core import Component, TracError, implements
+from trac.core import TracError
+from trac.util import escape, Markup
 from trac.web.chrome import ITemplateProvider
 from trac.web.main import IRequestHandler
 from trac.perm import IPermissionRequestor, PermissionCache, PermissionSystem
-from trac.util import escape, Markup
-from trac.core import Component, TracError, implements
-from trac.ticket import model
-from trac.core import TracError
 from trac.ticket.model import Ticket, Milestone, MilestoneCache, Version, Component as component
 from trac.ticket.web_ui import TicketModule
 from trac.ticket.api import TicketSystem
-from trac.ticket.query import Query, QueryModule, TicketQueryMacro, QueryValueError, QuerySyntaxError
 from multiproduct.model import Product
 from multiproduct.web_ui import ProductModule
 from multiproduct.ticket import query
+from trac.ticket.query import Query, QueryModule, TicketQueryMacro, QueryValueError, QuerySyntaxError
 from trac.resource import Resource, ResourceNotFound
 from trac.ticket.roadmap import get_tickets_for_milestone
 from trac.attachment import Attachment
-
-from trac.web.href import Href
-
 from multiproduct.env import ProductEnvironment
 
-from multiproduct.ticket.web_ui import ProductTicketModule
-
 class EmbeddingSystem(Component):
     implements(IRequestHandler, IPermissionRequestor, ITemplateProvider)
 
@@ -35,12 +29,13 @@ class EmbeddingSystem(Component):
         return ['TICKET_EMBED', 'MILESTONE_EMBED', 'PRODUCT_EMBED', 'QUERY_EMBED']
 
     def get_tickets_for_product(self, env, product=''):
-        """Retrieve all tickets associated with the product."""
+        """Retrieve all tickets associated with a product."""
         q = query.ProductQuery.from_string(env, 'product=%s' % product)
         return q.execute()
 
 
     def changeLog(self, id):
+        """Retrieve all changes associated with a ticket."""
         t = Ticket(self.env, id)
         for date, author, field, old, new, permanent in t.get_changelog():
             yield (date, author, field, old, new, permanent)
@@ -87,18 +82,21 @@ class EmbeddingSystem(Component):
 
     def process_request(self, req):
         name = req.args.get('name')
+
+
         if not (name == 'query'):
             id = req.args.get('id')
 
         if name == 'ticket':
+            ticket = Ticket(self.env, id)
             comm_num = 0
             attachment_num = len(self.get_attachments('ticket', id))
             ticket_log = self.changeLog(id)
+
             for log in ticket_log:
                 if log[2] == 'comment' and log[4]:
                     comm_num += 1
 
-            ticket = Ticket(self.env, id)
             data = {'ticket': ticket,
                     'comm_num': comm_num,
                     'attachment_num': attachment_num}
@@ -107,6 +105,7 @@ class EmbeddingSystem(Component):
         elif name == 'milestone':
             ticket_num = len(get_tickets_for_milestone(self.env, milestone=id))
             attachment_num = len(self.get_attachments('milestone', id))
+
             data = {'milestone': Milestone(self.env, id),
                     'product': self.env.product,
                     'ticket_number': ticket_num,
@@ -121,6 +120,7 @@ class EmbeddingSystem(Component):
             version_num = len(Version.select(product_env))
             components = component.select(product_env)
             component_num = 0
+
             for c in components:
                 component_num += 1
 
@@ -133,11 +133,9 @@ class EmbeddingSystem(Component):
             return 'bh_emb_product.html', data, None
         elif name == 'query':
             qstr = req.query_string
+            qstr = urllib.unquote(qstr).decode('utf8')
 
             if qstr=='':
-                # if req.authname and req.authname != 'anonymous':
-                #     qstr = 'status!=closed&owner=' + req.authname
-                # else:
                 qstr = 'status!=closed'
 
             qresults = self.query(req, qstr)
@@ -153,7 +151,6 @@ class EmbeddingSystem(Component):
             raise ResourceNotFound((msg), ("Invalid resource"))
 
 
-
     ### ITemplateProvider methods
 
     def get_templates_dirs(self):

Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_multiproduct/multiproduct/ticket/query.py
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_multiproduct/multiproduct/ticket/query.py?rev=1523785&r1=1523784&r2=1523785&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_multiproduct/multiproduct/ticket/query.py (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_multiproduct/multiproduct/ticket/query.py Mon Sep 16 20:08:10 2013
@@ -48,11 +48,11 @@ from multiproduct.env import lookup_prod
 
 class ProductQuery(Query):
     """Product Overrides for TracQuery.
-    
+
     This class allows for writing TracQuery expressions matching resources
     beyond product boundaries.
     """
-    
+
     def _count(self, sql, args):
         if isinstance(self.env, ProductEnvironment):
             return super(ProductQuery, self)._count(sql, args)
@@ -66,7 +66,7 @@ class ProductQuery(Query):
     def get_columns(self):
         super(ProductQuery, self).get_columns()
         if not 'product' in self.cols and self.group != 'product':
-            # make sure 'product' is always present 
+            # make sure 'product' is always present
             # (needed for product context, href, permission checks ...)
             # but don't implicitly include it if items are grouped by product
             self.cols.insert(0, 'product')
@@ -170,7 +170,7 @@ trac.ticket.QueryModule = ProductQueryMo
 
 
 class ProductTicketQueryMacro(TicketQueryMacro):
-    """TracQuery macro retrieving results across product boundaries. 
+    """TracQuery macro retrieving results across product boundaries.
     """
     @staticmethod
     def parse_args(content):
@@ -321,7 +321,7 @@ class ProductTicketQueryMacro(TicketQuer
                     env = lookup_product_env(self.env, prefix= pvalue,
                                              name=pvalue)
                 except LookupError:
-                    return tag.a('#%s' % ticket['id'], 
+                    return tag.a('#%s' % ticket['id'],
                                  class_='missing product')
                 hrefcache[pvalue] = envhref = resolve_product_href(
                          to_env=env, at_env=self.env)

Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_multiproduct/multiproduct/web_ui.py
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_multiproduct/multiproduct/web_ui.py?rev=1523785&r1=1523784&r2=1523785&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_multiproduct/multiproduct/web_ui.py (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_multiproduct/multiproduct/web_ui.py Mon Sep 16 20:08:10 2013
@@ -39,6 +39,7 @@ class ProductModule(Component):
 
     implements(IRequestHandler)
 
+
     # IRequestHandler methods
     def match_request(self, req):
         m = PRODUCT_RE.match(req.path_info)
@@ -112,36 +113,36 @@ class ProductModule(Component):
             req.perm(product.resource).require('PRODUCT_MODIFY')
         else:
             req.perm(product.resource).require('PRODUCT_CREATE')
-        
+
         chrome = Chrome(self.env)
         chrome.add_jquery_ui(req)
         chrome.add_wiki_toolbars(req)
-        data = {'product': product, 
+        data = {'product': product,
                 'context': web_context(req, product.resource)}
         return 'product_edit.html', data, None
-    
+
     def _do_save(self, req, product):
         """common processing for product save events"""
         req.perm.require('PRODUCT_VIEW')
-        
+
         name = req.args.get('name')
         prefix = req.args.get('prefix')
         description = req.args.get('description', '')
-        
+
         owner = req.args.get('owner') or req.authname
         keys = {'prefix': prefix}
         field_data = {'name': name,
                       'description': description,
                       'owner': owner,
                       }
-        
+
         warnings = []
         def warn(msg):
             add_warning(req, msg)
             warnings.append(msg)
-        
+
         if product._exists:
-            if name != product.name and Product.select(self.env, 
+            if name != product.name and Product.select(self.env,
                                                        where={'name': name}):
                 warn(_('A product with name "%(name)s" already exists, please '
                        'choose a different name.', name=name))
@@ -154,7 +155,7 @@ class ProductModule(Component):
                 add_notice(req, _('Your changes have been saved.'))
         else:
             req.perm.require('PRODUCT_CREATE')
-            
+
             if not prefix:
                 warn(_('You must provide a prefix for the product.'))
             elif Product.select(self.env, where={'prefix': prefix}):
@@ -165,7 +166,7 @@ class ProductModule(Component):
             elif Product.select(self.env, where={'name': name}):
                 warn(_('A product with name "%(name)s" already exists, please '
                        'choose a different name.', name=name))
-            
+
             if not warnings:
                 prod = Product(self.env)
                 prod.update_field_dict(keys)

Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_milestone_view.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_milestone_view.html?rev=1523785&r1=1523784&r2=1523785&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_milestone_view.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_milestone_view.html Mon Sep 16 20:08:10 2013
@@ -55,47 +55,50 @@
     <h1>Milestone ${milestone.name}</h1>
 
     <!-- Embedding plugin -->
-    <div style="margin: 10px 0;">
-      <a id="embed-btn" href="#embed-modal" role="button" class="btn" data-toggle="modal">Embed Milestone</a>
-
-      <script language="JavaScript" type="text/javascript">
-        function make_iframe(src) {
-          iframe = document.createElement("iframe");
-          var root = get_root()
-          $(iframe).attr("src", root + src);
-          $(iframe).attr("width", "550");
-          $(iframe).attr("height", "250");
-          $(iframe).attr("frameborder", "0");
-          $(iframe).attr("scrolling", "yes");
-          return $(iframe).get(0).outerHTML;
-       }
-
-       $('#embed-btn').click(function() {
-         $('#embed-textarea').val(make_iframe('${href.embed("milestone", milestone.name)}'));
-       });
-
-       function get_root() {
-        var root = window.location.protocol + '//' + window.location.host;
-        return root
-       }
-      </script>
-
-
-      <!-- Embedding Modal -->
-      <div id="embed-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-          <h3 id="myModalLabel">Embed this Milestone</h3>
-        </div>
-        <div class="modal-body">
-          <textarea id="embed-textarea" class="input-block-level" rows="4" style="width:100%;min-width:100%;max-width:100%;">
-          </textarea>
-        </div>
-        <div class="modal-footer">
-          <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+    <p>$bhembedding</p>
+    <span py:if="'MILESTONE_EMBED' in perm(milestone.resource) and bhembedding">
+      <div style="margin: 10px 0;">
+        <a id="embed-btn" href="#embed-modal" role="button" class="btn" data-toggle="modal">Embed Milestone</a>
+
+        <script language="JavaScript" type="text/javascript">
+          function make_iframe(src) {
+            iframe = document.createElement("iframe");
+            var root = get_root()
+            $(iframe).attr("src", root + src);
+            $(iframe).attr("width", "550");
+            $(iframe).attr("height", "250");
+            $(iframe).attr("frameborder", "0");
+            $(iframe).attr("scrolling", "yes");
+            return $(iframe).get(0).outerHTML;
+         }
+
+         $('#embed-btn').click(function() {
+           $('#embed-textarea').val(make_iframe('${href.embed("milestone", milestone.name)}'));
+         });
+
+         function get_root() {
+          var root = window.location.protocol + '//' + window.location.host;
+          return root
+         }
+        </script>
+
+
+        <!-- Embedding Modal -->
+        <div id="embed-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            <h3 id="myModalLabel">Embed this Milestone</h3>
+          </div>
+          <div class="modal-body">
+            <textarea id="embed-textarea" class="input-block-level" rows="4" style="width:100%;min-width:100%;max-width:100%;">
+            </textarea>
+          </div>
+          <div class="modal-footer">
+            <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+          </div>
         </div>
       </div>
-    </div>
+    </span>
 
     <h6>${milestone_date()}</h6>
   </py:def>

Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_query.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_query.html?rev=1523785&r1=1523784&r2=1523785&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_query.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_query.html Mon Sep 16 20:08:10 2013
@@ -291,50 +291,52 @@
 
 
         <!-- Embedding plugin -->
-        <a id="embed-btn" href="#embed-modal" role="button" class="btn" data-toggle="modal">Embed Results</a>
+        <span py:if="'QUERY_EMBED' in perm(query.resource) and bhembedding">
+          <a id="embed-btn" href="#embed-modal" role="button" class="btn" data-toggle="modal">Embed Results</a>
 
-        <script language="JavaScript" type="text/javascript">
-          function make_iframe() {
-            iframe = document.createElement("iframe");
-            var src = get_embed_path();
-            $(iframe).attr("src", src);
-            $(iframe).attr("width", "380");
-            $(iframe).attr("height", "380");
-            $(iframe).attr("frameborder", "0");
-            $(iframe).attr("scrolling", "yes");
-            return $(iframe).get(0).outerHTML;
-         }
-
-         $('#embed-btn').click(function() {
-           $('#embed-textarea').val(make_iframe());
-         });
-
-
-         function get_embed_path() {
-           var url = window.location.href
-           var url_array = url.split('/');
-           return window.location.protocol + '//' + window.location.host + '${href.embed()}' + '/' + url_array[url_array.length-1];
-         }
-        </script>
-
-
-        <!-- Embedding Modal -->
-        <div id="embed-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-            <h3 id="myModalLabel">Embed Query Results</h3>
-            <h5 py:if="req.authname!='anonymous' and req.query_string==''">
-              You cannot embed the default query corresponding to an authenticated user.
-              The snippet below embeds the query containing all open tickets.</h5>
+          <script language="JavaScript" type="text/javascript">
+            function make_iframe() {
+              iframe = document.createElement("iframe");
+              var src = get_embed_path();
+              $(iframe).attr("src", src);
+              $(iframe).attr("width", "380");
+              $(iframe).attr("height", "380");
+              $(iframe).attr("frameborder", "0");
+              $(iframe).attr("scrolling", "yes");
+              return $(iframe).get(0).outerHTML;
+           }
+
+           $('#embed-btn').click(function() {
+             $('#embed-textarea').val(make_iframe());
+           });
+
+
+           function get_embed_path() {
+             var url = window.location.href
+             var url_array = url.split('/');
+             return window.location.protocol + '//' + window.location.host + '${href.embed()}' + '/' + url_array[url_array.length-1];
+           }
+          </script>
+
+
+          <!-- Embedding Modal -->
+          <div id="embed-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+            <div class="modal-header">
+              <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+              <h3 id="myModalLabel">Embed Query Results</h3>
+              <h5 py:if="req.authname!='anonymous' and req.query_string==''">
+                You cannot embed the default query corresponding to an authenticated user.
+                The snippet below embeds the query containing all open tickets.</h5>
+            </div>
+            <div class="modal-body">
+              <textarea id="embed-textarea" rows="5" class="input-block-level" style="width:100%;min-width:100%;max-width:100%;">
+              </textarea>
+            </div>
+            <div class="modal-footer">
+              <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+            </div>
           </div>
-          <div class="modal-body">
-            <textarea id="embed-textarea" rows="5" class="input-block-level" style="width:100%;min-width:100%;max-width:100%;">
-            </textarea>
-          </div>
-          <div class="modal-footer">
-            <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
-          </div>
-        </div>
+        </span>
 
         <form py:if="delete" method="get" action="${url_of(report_resource)}"
             style="display: inline-block">

Modified: bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_ticket.html
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_ticket.html?rev=1523785&r1=1523784&r2=1523785&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_ticket.html (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/bloodhound_theme/bhtheme/templates/bh_ticket.html Mon Sep 16 20:08:10 2013
@@ -357,46 +357,48 @@
       </h5>
 
       <!-- Embedding plugin -->
-      <span class="btn-toolbar">
-        <a id="embed-btn" href="#embed-modal" role="button" class="btn" data-toggle="modal">Embed Ticket</a>
-
-        <script language="JavaScript" type="text/javascript">
-          function make_iframe(src) {
-            iframe = document.createElement("iframe");
-            var root = get_root()
-            $(iframe).attr("src", root + src);
-            $(iframe).attr("width", "470");
-            $(iframe).attr("height", "480");
-            $(iframe).attr("frameborder", "0");
-            $(iframe).attr("scrolling", "yes");
-            return $(iframe).get(0).outerHTML;
-         }
-
-         $('#embed-btn').click(function() {
-           $('#embed-textarea').val(make_iframe('${href.embed("ticket", ticket.id)}'));
-         });
-
-         function get_root() {
-           var root = window.location.protocol + '//' + window.location.host;
-           return root
-         }
-        </script>
-
-
-        <!-- Embedding Modal -->
-        <div id="embed-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-            <h3 id="myModalLabel">Embed this Ticket</h3>
-          </div>
-          <div class="modal-body">
-            <textarea id="embed-textarea" rows="4" class="input-block-level" style="width:100%;min-width:100%;max-width:100%;">
-            </textarea>
-          </div>
-          <div class="modal-footer">
-            <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+      <span py:if="'TICKET_EMBED' in perm(ticket.resource) and bhembedding">
+        <span class="btn-toolbar">
+          <a id="embed-btn" href="#embed-modal" role="button" class="btn" data-toggle="modal">Embed Ticket</a>
+
+          <script language="JavaScript" type="text/javascript">
+            function make_iframe(src) {
+              iframe = document.createElement("iframe");
+              var root = get_root()
+              $(iframe).attr("src", root + src);
+              $(iframe).attr("width", "470");
+              $(iframe).attr("height", "480");
+              $(iframe).attr("frameborder", "0");
+              $(iframe).attr("scrolling", "yes");
+              return $(iframe).get(0).outerHTML;
+           }
+
+           $('#embed-btn').click(function() {
+             $('#embed-textarea').val(make_iframe('${href.embed("ticket", ticket.id)}'));
+           });
+
+           function get_root() {
+             var root = window.location.protocol + '//' + window.location.host;
+             return root
+           }
+          </script>
+
+
+          <!-- Embedding Modal -->
+          <div id="embed-modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+            <div class="modal-header">
+              <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+              <h3 id="myModalLabel">Embed this Ticket</h3>
+            </div>
+            <div class="modal-body">
+              <textarea id="embed-textarea" rows="4" class="input-block-level" style="width:100%;min-width:100%;max-width:100%;">
+              </textarea>
+            </div>
+            <div class="modal-footer">
+              <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+            </div>
           </div>
-        </div>
+        </span>
       </span>
 
       <span id="inplace-edit-button" py:if="has_property_editor"

Modified: bloodhound/branches/bep_0007_embeddable_objects/installer/requirements-dev.txt
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/installer/requirements-dev.txt?rev=1523785&r1=1523784&r2=1523785&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/installer/requirements-dev.txt (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/installer/requirements-dev.txt Mon Sep 16 20:08:10 2013
@@ -29,4 +29,5 @@ TracThemeEngine
 TracPermRedirect
 -e ../bloodhound_search
 -e ../bloodhound_relations
-
+# Embedding plugin
+-e ../bloodhound_embedding_plugin

Modified: bloodhound/branches/bep_0007_embeddable_objects/trac/trac/ticket/api.py
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/trac/trac/ticket/api.py?rev=1523785&r1=1523784&r2=1523785&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/trac/trac/ticket/api.py (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/trac/trac/ticket/api.py Mon Sep 16 20:08:10 2013
@@ -165,13 +165,13 @@ class ITicketFieldProvider(Interface):
         """Returns a list of select fields, each as a tuple of
         (rank, field)
         where field is a dictionary that defines:
-            * name: the field name 
+            * name: the field name
             * pk: the primary key of the field table
             * label: the label to display, preferably wrapped with N_()
             * cls: the model describing the field
         the following keys can also usefully be defined:
             * optional: a boolean specifying that the select can be empty
-        
+
         The rank is expected to be an integer to specify the sorting of the
         select and radio fields. This is not intended to allow for the extent
         of configurability of the custom fields but allows a plugin to mix in
@@ -342,11 +342,11 @@ class TicketSystem(Component):
 
         # Default select and radio fields
         selects = []
-        [selects.extend(field_provider.get_select_fields()) 
+        [selects.extend(field_provider.get_select_fields())
                     for field_provider in self.ticket_field_providers]
         [select.update({'type': 'select'}) for n, select in selects]
         radios = []
-        [radios.extend(field_provider.get_radio_fields()) 
+        [radios.extend(field_provider.get_radio_fields())
                     for field_provider in self.ticket_field_providers]
         [radio.update({'type': 'radio',
                        'optional': True}) for n, radio in radios]
@@ -643,17 +643,17 @@ class TicketSystem(Component):
     def get_select_fields(self):
         """Default select and radio fields"""
         from trac.ticket import model
-        selects = [(10, {'name': 'type', 'label': N_('Type'), 
+        selects = [(10, {'name': 'type', 'label': N_('Type'),
                          'cls': model.Type}),
-                   (30, {'name':'priority', 'label': N_('Priority'), 
+                   (30, {'name':'priority', 'label': N_('Priority'),
                          'cls': model.Priority}),
-                   (40, {'name': 'milestone', 'label': N_('Milestone'), 
+                   (40, {'name': 'milestone', 'label': N_('Milestone'),
                          'cls': model.Milestone, 'optional': True}),
-                   (50, {'name': 'component', 'label': N_('Component'), 
+                   (50, {'name': 'component', 'label': N_('Component'),
                          'cls': model.Component}),
-                   (60, {'name': 'version', 'label': N_('Version'), 
+                   (60, {'name': 'version', 'label': N_('Version'),
                          'cls': model.Version, 'optional': True}),
-                   (70, {'name': 'severity', 'label': N_('Severity'), 
+                   (70, {'name': 'severity', 'label': N_('Severity'),
                          'cls': model.Severity})]
         return selects
 
@@ -662,6 +662,6 @@ class TicketSystem(Component):
         from trac.ticket import model
         radios = [(20, {'name': 'status', 'label': N_('Status'),
                         'cls': model.Status}),
-                  (80, {'name': 'resolution', 'label': N_('Resolution'), 
+                  (80, {'name': 'resolution', 'label': N_('Resolution'),
                         'cls': model.Resolution})]
         return radios

Modified: bloodhound/branches/bep_0007_embeddable_objects/trac/trac/ticket/query.py
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/trac/trac/ticket/query.py?rev=1523785&r1=1523784&r2=1523785&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/trac/trac/ticket/query.py (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/trac/trac/ticket/query.py Mon Sep 16 20:08:10 2013
@@ -41,7 +41,7 @@ from trac.util.presentation import Pagin
 from trac.util.text import empty, shorten_line, quote_query_string
 from trac.util.translation import _, tag_, cleandoc_
 from trac.util.introspection import get_enabled_component_subclass
-from trac.web import arg_list_to_args, parse_arg_list, IRequestHandler
+from trac.web import arg_list_to_args, parse_arg_list, IRequestHandler, IRequestFilter
 from trac.web.href import Href
 from trac.web.chrome import (INavigationContributor, Chrome,
                              add_ctxtnav, add_link, add_script,
@@ -824,7 +824,7 @@ class Query(object):
 class QueryModule(Component):
 
     implements(IRequestHandler, INavigationContributor, IWikiSyntaxProvider,
-               IContentConverter)
+               IContentConverter, IRequestFilter)
 
     default_query = Option('query', 'default_query',
         default='status!=closed&owner=$USER',
@@ -877,6 +877,23 @@ class QueryModule(Component):
             yield ('mainnav', 'tickets',
                    tag.a(_('View Tickets'), href=req.href.query()))
 
+
+    # IRequestFilter methods
+
+    def pre_process_request(self, req, handler):
+        """Pre process request filter"""
+
+        return handler
+
+    def post_process_request(self, req, template, data, content_type):
+        """Post process request filter. """
+
+        if data is not None:
+            data['bhembedding'] = self.env.config.getbool('components', 'bhembedding.*')
+
+        return template, data, content_type
+
+
     # IRequestHandler methods
 
     def match_request(self, req):

Modified: bloodhound/branches/bep_0007_embeddable_objects/trac/trac/ticket/roadmap.py
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/trac/trac/ticket/roadmap.py?rev=1523785&r1=1523784&r2=1523785&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/trac/trac/ticket/roadmap.py (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/trac/trac/ticket/roadmap.py Mon Sep 16 20:08:10 2013
@@ -48,6 +48,9 @@ from trac.wiki.api import IWikiSyntaxPro
 from trac.wiki.formatter import format_to
 
 
+from trac.web.main import IRequestFilter
+
+
 class ITicketGroupStatsProvider(Interface):
     def get_ticket_group_stats(ticket_ids):
         """ Gather statistics on a group of tickets.
@@ -585,7 +588,7 @@ class MilestoneModule(Component):
 
     implements(INavigationContributor, IPermissionRequestor, IRequestHandler,
                ITimelineEventProvider, IWikiSyntaxProvider, IResourceManager,
-               ISearchSource)
+               ISearchSource, IRequestFilter)
 
     stats_provider = ExtensionOption('milestone', 'stats_provider',
                                      ITicketGroupStatsProvider,
@@ -645,6 +648,24 @@ class MilestoneModule(Component):
             return format_to(self.env, None, context.child(resource=milestone),
                              description)
 
+
+    # IRequestFilter methods
+
+    def pre_process_request(self, req, handler):
+        """Pre process request filter"""
+
+        return handler
+
+    def post_process_request(self, req, template, data, content_type):
+        """Post process request filter. """
+
+        # trac.web.auth.loginmodule
+        if data is not None:
+            data['bhembedding'] = self.env.config.getbool('components', 'bhembedding.*')
+
+        return template, data, content_type
+
+
     # IRequestHandler methods
 
     def match_request(self, req):

Modified: bloodhound/branches/bep_0007_embeddable_objects/trac/trac/ticket/web_ui.py
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0007_embeddable_objects/trac/trac/ticket/web_ui.py?rev=1523785&r1=1523784&r2=1523785&view=diff
==============================================================================
--- bloodhound/branches/bep_0007_embeddable_objects/trac/trac/ticket/web_ui.py (original)
+++ bloodhound/branches/bep_0007_embeddable_objects/trac/trac/ticket/web_ui.py Mon Sep 16 20:08:10 2013
@@ -60,6 +60,9 @@ from trac.web.chrome import (
 from trac.wiki.formatter import format_to, format_to_html, format_to_oneliner
 
 
+# Embedding
+from trac.web.main import IRequestFilter
+
 class InvalidTicket(TracError):
     """Exception raised when a ticket fails validation."""
     title = N_("Invalid Ticket")
@@ -68,7 +71,7 @@ class InvalidTicket(TracError):
 class TicketModule(Component):
 
     implements(IContentConverter, INavigationContributor, IRequestHandler,
-               ISearchSource, ITemplateProvider, ITimelineEventProvider)
+               ISearchSource, ITemplateProvider, ITimelineEventProvider, IRequestFilter)
 
     ticket_manipulators = ExtensionPoint(ITicketManipulator)
 
@@ -162,6 +165,24 @@ class TicketModule(Component):
                    tag.a(_("New Ticket"), href=req.href.newticket(),
                          accesskey=7))
 
+
+    # IRequestFilter methods
+
+    def pre_process_request(self, req, handler):
+        """Pre process request filter"""
+
+        return handler
+
+    def post_process_request(self, req, template, data, content_type):
+        """Post process request filter. """
+
+        if data is not None:
+            data['bhembedding'] = self.env.config.getbool('components', 'bhembedding.*')
+
+        return template, data, content_type
+
+
+
     # IRequestHandler methods
 
     def match_request(self, req):