You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/09/12 17:08:50 UTC
[1/3] git commit: remove extraneous app_config_id index on Ticket
Updated Branches:
refs/heads/cj/6529 c33f5b993 -> ed554cb09 (forced update)
remove extraneous app_config_id index on Ticket
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/8e5201d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/8e5201d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/8e5201d5
Branch: refs/heads/cj/6529
Commit: 8e5201d56a6089d5d79affb4c8a2cc06f4b04582
Parents: 21b64d0
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Wed Sep 11 18:20:44 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Sep 11 18:20:44 2013 +0000
----------------------------------------------------------------------
ForgeTracker/forgetracker/model/ticket.py | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/8e5201d5/ForgeTracker/forgetracker/model/ticket.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py
index 505a991..71fe6c5 100644
--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -526,7 +526,6 @@ class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
history_class = TicketHistory
indexes = [
'ticket_num',
- 'app_config_id',
('app_config_id', 'custom_fields._milestone'),
'import_id',
]
[2/3] git commit: [#6545] add "timestamp" index back to ForumPost
which was removed from Artifact in [58083948]
Posted by jo...@apache.org.
[#6545] add "timestamp" index back to ForumPost which was removed from Artifact in [58083948]
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/224017c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/224017c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/224017c7
Branch: refs/heads/cj/6529
Commit: 224017c76aec0b4009ff069e4a834bf969befe7d
Parents: 8e5201d
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Wed Sep 11 19:57:07 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Sep 11 19:57:07 2013 +0000
----------------------------------------------------------------------
ForgeDiscussion/forgediscussion/model/forum.py | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/224017c7/ForgeDiscussion/forgediscussion/model/forum.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/model/forum.py b/ForgeDiscussion/forgediscussion/model/forum.py
index 84040da..c13bb57 100644
--- a/ForgeDiscussion/forgediscussion/model/forum.py
+++ b/ForgeDiscussion/forgediscussion/model/forum.py
@@ -205,6 +205,9 @@ class ForumPost(M.Post):
class __mongometa__:
name='forum_post'
history_class = ForumPostHistory
+ indexes = [
+ 'timestamp', # for the posts_24hr site_stats query
+ ]
type_s = 'Post'
discussion_id = ForeignIdProperty(Forum)
[3/3] git commit: [#6529] Added login overlay for project importers
Posted by jo...@apache.org.
[#6529] Added login overlay for project importers
Signed-off-by: Cory Johns <cj...@slashdotmedia.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/ed554cb0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/ed554cb0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/ed554cb0
Branch: refs/heads/cj/6529
Commit: ed554cb09e7966f1ff665e39158f4d26b6ca3642
Parents: 224017c
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Tue Sep 10 21:55:05 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Thu Sep 12 15:08:21 2013 +0000
----------------------------------------------------------------------
Allura/allura/controllers/auth.py | 4 ++
Allura/allura/lib/app_globals.py | 7 +++
Allura/allura/lib/security.py | 10 +++-
Allura/allura/lib/widgets/forms.py | 3 +-
.../lib/widgets/resources/js/login_overlay.js | 27 +++++++++
Allura/allura/nf/allura/css/allura.css | 13 ++++-
.../allura/templates/jinja_master/master.html | 3 +
.../templates/jinja_master/theme_macros.html | 11 +++-
Allura/allura/templates/login_fragment.html | 60 ++++++++++++++++++++
Allura/allura/templates/widgets/forge_form.html | 1 +
ForgeImporters/forgeimporters/base.py | 3 +-
11 files changed, 135 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ed554cb0/Allura/allura/controllers/auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/auth.py b/Allura/allura/controllers/auth.py
index 4c1ee37..fa00208 100644
--- a/Allura/allura/controllers/auth.py
+++ b/Allura/allura/controllers/auth.py
@@ -105,6 +105,10 @@ class AuthController(BaseController):
c.form = F.login_form
return dict(oid_providers=OID_PROVIDERS, return_to=return_to)
+ @expose('jinja:allura:templates/login_fragment.html')
+ def login_fragment(self, *args, **kwargs):
+ return self.index(*args, **kwargs)
+
@expose('jinja:allura:templates/custom_login.html')
def login_verify_oid(self, provider, username, return_to=None):
if provider:
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ed554cb0/Allura/allura/lib/app_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index c1c0b32..e684383 100644
--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -115,6 +115,7 @@ class Globals(object):
# Load login/logout urls; only used for SFX logins
self.login_url = config.get('auth.login_url', '/auth/')
self.logout_url = config.get('auth.logout_url', '/auth/logout')
+ self.login_fragment_url = config.get('auth.login_fragment_url', '/auth/login_fragment')
# Setup Gravatar
self.gravatar = gravatar.url
@@ -401,6 +402,12 @@ class Globals(object):
def resource_manager(self):
return ew_core.widget_context.resource_manager
+ def register_css(self, href, **kw):
+ self.resource_manager.register(ew.CSSLink(href, **kw))
+
+ def register_js(self, href, **kw):
+ self.resource_manager.register(ew.JSLink(href, **kw))
+
def register_forge_css(self, href, **kw):
self.resource_manager.register(ew.CSSLink('allura/' + href, **kw))
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ed554cb0/Allura/allura/lib/security.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/security.py b/Allura/allura/lib/security.py
index a0497ca..4718e56 100644
--- a/Allura/allura/lib/security.py
+++ b/Allura/allura/lib/security.py
@@ -383,7 +383,7 @@ def all_allowed(obj, user_or_role=None, project=None):
return set([M.ALL_PERMISSIONS])
return perms
-def require(predicate, message=None):
+def require(predicate, message=None, login_overlay=False):
'''
Example: require(has_access(c.app, 'read'))
@@ -401,13 +401,17 @@ def require(predicate, message=None):
if c.user != M.User.anonymous():
request.environ['error_message'] = message
raise exc.HTTPForbidden(detail=message)
+ elif login_overlay:
+ c.show_login_overlay = True
else:
raise exc.HTTPUnauthorized()
-def require_access(obj, permission, **kwargs):
+def require_access(obj, permission, login_overlay=False, **kwargs):
if obj is not None:
predicate = has_access(obj, permission, **kwargs)
- return require(predicate, message='%s access required' % permission.capitalize())
+ return require(predicate,
+ message='%s access required' % permission.capitalize(),
+ login_overlay=login_overlay)
else:
raise exc.HTTPForbidden(detail="Could not verify permissions for this page.")
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ed554cb0/Allura/allura/lib/widgets/forms.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/forms.py b/Allura/allura/lib/widgets/forms.py
index ae90b26..9d3f602 100644
--- a/Allura/allura/lib/widgets/forms.py
+++ b/Allura/allura/lib/widgets/forms.py
@@ -84,7 +84,8 @@ class ForgeForm(ew.SimpleForm):
submit_text='Save',
style='standard',
method='post',
- enctype=None)
+ enctype=None,
+ target=None)
def display_label(self, field, label_text=None):
ctx = super(ForgeForm, self).context_for(field)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ed554cb0/Allura/allura/lib/widgets/resources/js/login_overlay.js
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/resources/js/login_overlay.js b/Allura/allura/lib/widgets/resources/js/login_overlay.js
new file mode 100644
index 0000000..c852916
--- /dev/null
+++ b/Allura/allura/lib/widgets/resources/js/login_overlay.js
@@ -0,0 +1,27 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+
+/*global jQuery, $ */
+jQuery(function($) {
+ $('#login_overlay').draggable().lightbox_me({
+ closeClick: false,
+ closeEsc: false,
+ centered: true
+ });
+});
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ed554cb0/Allura/allura/nf/allura/css/allura.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/allura.css b/Allura/allura/nf/allura/css/allura.css
index 1334b0c..38404f7 100644
--- a/Allura/allura/nf/allura/css/allura.css
+++ b/Allura/allura/nf/allura/css/allura.css
@@ -215,4 +215,15 @@ b.ico.ico-vote-down { background-image: url('../images/vote_down.png'); }
tr.rev div.markdown_content p {
padding: 0;
margin-bottom: 0;
-}
\ No newline at end of file
+}
+
+#login_overlay .title {
+ margin-bottom: 0;
+ padding-left: 10px;
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
+}
+
+#login_overlay iframe {
+ width: 400px;
+}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ed554cb0/Allura/allura/templates/jinja_master/master.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html
index e3afa6a..8060240 100644
--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -132,6 +132,9 @@
</section>
{% endfor %}
</div>
+ {% if c.show_login_overlay %}
+ {{theme_macros.login_overlay()}}
+ {% endif %}
{% for blob in g.resource_manager.emit('body_js') %}
{{ blob }}
{% endfor %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ed554cb0/Allura/allura/templates/jinja_master/theme_macros.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/theme_macros.html b/Allura/allura/templates/jinja_master/theme_macros.html
index 61f5e2f..7fc070c 100644
--- a/Allura/allura/templates/jinja_master/theme_macros.html
+++ b/Allura/allura/templates/jinja_master/theme_macros.html
@@ -112,4 +112,13 @@
{% endif %}
</div>
{% endif %}
-{%- endmacro %}
\ No newline at end of file
+{%- endmacro %}
+
+{%- macro login_overlay() %}
+ {% do g.register_js('js/jquery.lightbox_me.js') %}
+ {% do g.register_js('js/login_overlay.js') %}
+ <div id="login_overlay" class="ui-widget-content">
+ <h2 class="dark title">Login Required</h2>
+ <iframe src="{{g.login_fragment_url}}"></iframe>
+ </div>
+{%- endmacro %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ed554cb0/Allura/allura/templates/login_fragment.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/login_fragment.html b/Allura/allura/templates/login_fragment.html
new file mode 100644
index 0000000..31fb26d
--- /dev/null
+++ b/Allura/allura/templates/login_fragment.html
@@ -0,0 +1,60 @@
+{#-
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-#}
+<!DOCTYPE html>
+<!-- Server: {{g.server_name}} -->
+{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
+{% if g.theme.jinja_macros %}
+ {% import g.theme.jinja_macros as theme_macros with context %}
+{% endif %}
+{% do g.register_forge_js('js/jquery-base.js') %}
+{% do g.register_forge_js('js/allura-base.js') %}
+{% do g.theme.require() %}
+{% do g.resource_manager.register_widgets(c) %}
+{# paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ #}
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"> <![endif]-->
+<!--[if IE 7 ]> <html lang="en" class="no-js ie7"> <![endif]-->
+<!--[if IE 8 ]> <html lang="en" class="no-js ie8"> <![endif]-->
+<!--[if IE 9 ]> <html lang="en" class="no-js ie9"> <![endif]-->
+<!--[if (gt IE 9)|!(IE)]>--> <html lang="en" class="no-js"> <!--<![endif]-->
+ <head>
+ {{theme_macros.extra_header(g.theme_href(''))}}
+ {% for blob in g.resource_manager.emit('head_css') %}
+ {{ blob }}
+ {% endfor %}
+ {% for blob in g.resource_manager.emit('head_js') %}
+ {{ blob }}
+ {% endfor %}
+ <style type="text/css">
+ html {
+ overflow: hidden;
+ }
+ body {
+ padding-top: 1em;
+ width: 1000px;
+ }
+ </style>
+ </head>
+ <body>
+ {{ c.form.display(action='../do_login', target='_top', value=dict(return_to=return_to)) }}
+
+ {% for blob in g.resource_manager.emit('body_js_tail') %}
+ {{ blob }}
+ {% endfor %}
+ </body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ed554cb0/Allura/allura/templates/widgets/forge_form.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/forge_form.html b/Allura/allura/templates/widgets/forge_form.html
index 8adde73..adbc01c 100644
--- a/Allura/allura/templates/widgets/forge_form.html
+++ b/Allura/allura/templates/widgets/forge_form.html
@@ -18,6 +18,7 @@
-#}
<form method="{{method}}"
{% if enctype %}enctype="{{enctype}}"{% endif %}
+ {% if target %}target="{{target}}"{% endif %}
action="{{action}}">
{% set extra_width = 0 %}
{% if style == 'wide' %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ed554cb0/ForgeImporters/forgeimporters/base.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/base.py b/ForgeImporters/forgeimporters/base.py
index ffb1650..8cb8066 100644
--- a/ForgeImporters/forgeimporters/base.py
+++ b/ForgeImporters/forgeimporters/base.py
@@ -188,7 +188,7 @@ class ProjectImporter(BaseController):
self.neighborhood = neighborhood
def _check_security(self):
- require_access(self.neighborhood, 'register')
+ require_access(self.neighborhood, 'register', login_overlay=True)
@LazyProperty
def tool_importers(self):
@@ -229,6 +229,7 @@ class ProjectImporter(BaseController):
tools installed and redirect to the new project, presumably with a
message indicating that some data will not be available immediately.
"""
+ require_access(self.neighborhood, 'register', login_overlay=False)
try:
c.project = self.neighborhood.register_project(kw['project_shortname'],
project_name=kw['project_name'])