[Pkg-mozext-commits] [requestpolicy] 08/100: Display subscription rules in manage policy page.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit 6902de31ae25a242406c750b80b9b8291f541ff1
Author: Christopher Bura <christopher.bura at gmail.com>
Date:   Tue Sep 2 04:06:00 2014 -0400

    Display subscription rules in manage policy page.
---
 src/content/settings/settings.css  | 3 +--
 src/content/settings/yourpolicy.js | 9 +++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/content/settings/settings.css b/src/content/settings/settings.css
index a0f36ca..1c87ab7 100644
--- a/src/content/settings/settings.css
+++ b/src/content/settings/settings.css
@@ -202,7 +202,6 @@ table.settings tr:not(:first-child) {
 }
 
 #policy-user tbody {
-  max-height: 400px;
   border: 1px solid #ddd;
 }
 
@@ -218,7 +217,7 @@ table.settings tr:not(:first-child) {
 }
 
 #policy-user col.source {
-  width: 150px;
+  width: 200px;
 }
 
 #policy-user col.remove {
diff --git a/src/content/settings/yourpolicy.js b/src/content/settings/yourpolicy.js
index 284a3ed..527121e 100644
--- a/src/content/settings/yourpolicy.js
+++ b/src/content/settings/yourpolicy.js
@@ -63,6 +63,15 @@ function populateRuleTable(filter) {
   var entries = temp.rawPolicy.toJSON()['entries'];
   addPolicies(entries, 'Temporary', filter);
 
+  // Get and display subscription policies
+  var subscription_lists = policyMgr._subscriptionPolicies;
+  for (subscription_list in subscription_lists) {
+    for (subscription in subscription_lists[subscription_list]) {
+      entries = subscription_lists[subscription_list][subscription].rawPolicy.toJSON()['entries'];
+      addPolicies(entries, subscription, filter);
+    }
+  }
+
 }
 
 function addPolicies(entries, source, filter) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git