allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [3/3] git commit: [#5015] Upgrade EasyWidgets and fix failing tests
Date Fri, 28 Sep 2012 17:31:07 GMT
[#5015] Upgrade EasyWidgets and fix failing tests

Signed-off-by: Cory Johns <johnsca@geek.net>


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/9184c473
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/9184c473
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/9184c473

Branch: refs/heads/master
Commit: 9184c473d27069b1ae11eb40989539a15a3860fc
Parents: ee5eb27
Author: Cory Johns <johnsca@geek.net>
Authored: Thu Sep 27 22:01:23 2012 +0000
Committer: Dave Brondsema <dbrondsema@geek.net>
Committed: Fri Sep 28 17:18:15 2012 +0000

----------------------------------------------------------------------
 .../templates/neighborhood_admin_overview.html     |    2 +-
 .../widgets/neighborhood_overview_form.html        |   10 +++++-----
 .../templates/discussionforums/admin_forums.html   |    2 +-
 .../templates/discussionforums/index.html          |    2 +-
 .../forgediscussion/tests/functional/test_forum.py |    1 +
 requirements-common.txt                            |    2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/9184c473/Allura/allura/templates/neighborhood_admin_overview.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/neighborhood_admin_overview.html b/Allura/allura/templates/neighborhood_admin_overview.html
index e9dfea5..9b1bea0 100644
--- a/Allura/allura/templates/neighborhood_admin_overview.html
+++ b/Allura/allura/templates/neighborhood_admin_overview.html
@@ -13,7 +13,7 @@
 {% endblock %}
 
 {% block content %}
-    {{c.overview_form.display(value=neighborhood)}}
+    {{c.overview_form.display(value=neighborhood, neighborhood=neighborhood)}}
 {% endblock %}
 
 {% block extra_css %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/9184c473/Allura/allura/templates/widgets/neighborhood_overview_form.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/neighborhood_overview_form.html b/Allura/allura/templates/widgets/neighborhood_overview_form.html
index e9e944c..8e80efd 100644
--- a/Allura/allura/templates/widgets/neighborhood_overview_form.html
+++ b/Allura/allura/templates/widgets/neighborhood_overview_form.html
@@ -5,7 +5,7 @@
     <div class="grid-14">{{widget.display_field(widget.fields.name)}}</div>
     <label class="grid-4">Redirect</label>
     <div class="grid-14">{{widget.display_field(widget.fields.redirect)}}</div>
-  {% if value.has_home_tool %}
+  {% if neighborhood.has_home_tool %}
     <label class="grid-4">Home Content (HTML)</label>
     <div class="grid-14">{{widget.display_field(widget.fields.homepage)}}</div>
     <label class="grid-4">Allow Browsing</label>
@@ -13,7 +13,7 @@
   {% endif %}
     <label class="grid-4">Show Title</label>
     <div class="grid-14">{{widget.display_field(widget.fields.show_title)}}</div>
-  {% if value.allow_custom_css %}
+  {% if neighborhood.allow_custom_css %}
     <label class="grid-4">Custom CSS</label>
     <div class="grid-14">{{widget.display_field(widget.fields.css)}}</div>
   {% endif %}
@@ -21,12 +21,12 @@
     <div class="grid-14">{{widget.display_field(widget.fields.project_template)}}</div>
     <label class="grid-4">Icon</label>
     <div class="grid-14">
-      {% if value.icon %}
-        <img src="{{value.url()}}/icon" style="vertical-align: middle" alt=""/>
+      {% if neighborhood.icon %}
+        <img src="{{neighborhood.url()}}/icon" style="vertical-align: middle" alt=""/>
       {% endif %}
       {{widget.display_field(widget.fields.icon)}}
     </div>
-    {% if value.features and value.features['google_analytics'] %}
+    {% if neighborhood.features and neighborhood.features['google_analytics'] %}
     <label class="grid-4">Analytics Tracking ID</label>
     <div class="grid-14">{{widget.display_field(widget.fields.tracking_id)}}</div>
     {% endif %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/9184c473/ForgeDiscussion/forgediscussion/templates/discussionforums/admin_forums.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussionforums/admin_forums.html
b/ForgeDiscussion/forgediscussion/templates/discussionforums/admin_forums.html
index b910ce9..214bb6c 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/admin_forums.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/admin_forums.html
@@ -91,7 +91,7 @@
   </table>
   <div class="grid-19"><input type="button" id="add_forum" value="Add another forum"></div>
 </form>
-{{c.add_forum.display(method='POST',action='add_forum',app=app, value=add_forum)}}
+{{c.add_forum.display(method='POST',action='add_forum',app=app, value=c.add_forum)}}
 {% endblock %}
 
 {% block extra_js %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/9184c473/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
index 00d7f6b..859c12c 100644
--- a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
+++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html
@@ -11,7 +11,7 @@
 {% if h.has_access(c.app, 'configure')() and (not hide_forum) %}
   {% block edit_box %}
     <div id="add_forum_form"{% if hide_forum %} style="display:none"{% endif %} class="editbox">
-      {{c.add_forum.display(method='POST', action=c.project.url() + c.app.config.options.mount_point
+ '/add_forum_short', app=c.app, value=add_forum)}}
+      {{c.add_forum.display(method='POST', action=c.project.url() + c.app.config.options.mount_point
+ '/add_forum_short', app=c.app, value=c.add_forum)}}
     </div>
   {% endblock %}
 {% endif %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/9184c473/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
index ab6f84b..93d9023 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
@@ -253,6 +253,7 @@ class TestForum(TestController):
         r.forms[1]['add_forum.name'] = 'Test Forum'
         r.forms[1].submit()
         r = self.app.get('/admin/discussion/forums')
+        frm = FM.Forum.query.get(shortname='testforum')
         assert 'testforum' in r
         h.set_context('test', 'discussion', neighborhood='Projects')
         frm = FM.Forum.query.get(shortname='testforum')

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/9184c473/requirements-common.txt
----------------------------------------------------------------------
diff --git a/requirements-common.txt b/requirements-common.txt
index 1a9b0ef..acf0043 100644
--- a/requirements-common.txt
+++ b/requirements-common.txt
@@ -9,7 +9,7 @@ Creoleparser==0.7.3
 decorator==3.3.2
 # dep of pypeline
 docutils==0.8.1
-EasyWidgets==0.2dev-20120918
+EasyWidgets==0.2dev-20120920
 faulthandler==2.1
 feedparser==5.0.1
 FormEncode==1.2.4


Mime
View raw message