Merge branch 'master' of ssh://git.fedorahosted.org/git/fedora-infrastructure

fas/fas.spec

@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           fas
-Version:        0.2
+Version:        0.4
 Release:        1%{?dist}
 Summary:        Fedora Account System
 
@@ -56,6 +56,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
 mv $RPM_BUILD_ROOT%{_bindir}/start-fas $RPM_BUILD_ROOT%{_sbindir}
 # Unreadable by others because it's going to contain a database password.
 install fas.cfg $RPM_BUILD_ROOT%{_sysconfdir}
+install client/fas.conf $RPM_BUILD_ROOT%{_sysconfdir}
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -77,8 +78,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files clients
 %{_bindir}/*
+%config(noreplace) %{_sysconfdir}/fas.conf
 
 %changelog
+* Tue Mar 11 2008 Mike McGrath <mmcgrath@redhat.com> - 0.4-1
+- added fas.conf will fix later.
+
+* Mon Mar 10 2008 Mike McGrath <mmcgrath@redhat.com> - 0.3-1
+- Upstream released a new version.
+
 * Mon Mar 10 2008 Mike McGrath <mmcgrath@redhat.com> - 0.2-1
 - Added fas user/group
 

fas/fas/controllers.py

@@ -125,8 +125,7 @@ class Root(controllers.RootController):
             msg=_("Please log in.")
             forward_url= '.'
 
-        ### FIXME: Is it okay to get rid of this?
+        cherrypy.response.status=403
-        #cherrypy.response.status=403
         return dict(message=msg, previous_url=previous_url, logging_in=True,
                     original_parameters=request.params,
                     forward_url=forward_url)

fas/fas/group.py

@@ -255,7 +255,7 @@ class Group(controllers.Controller):
         re_search = re.sub(r'\*', r'%', search).lower()
         results = Groups.query.filter(Groups.name.like(re_search)).order_by('name').all()
         if self.jsonRequest():
-            membersql = sqlalchemy.select([PersonRoles.c.person_id, PersonRoles.c.group_id]).order_by(PersonRoles.c.group_id)
+            membersql = sqlalchemy.select([PersonRoles.c.person_id, PersonRoles.c.group_id], PersonRoles.c.role_status=='approved').order_by(PersonRoles.c.group_id)
             members = membersql.execute()
             for member in members:
                 try:

fas/fas/templates/master.html

@@ -66,6 +66,7 @@
             <li py:if="not tg.identity.anonymous"><a href="${tg.url('/group/list/A*')}">${_('Apply For a new Group')}</a></li>
             <li><a href="http://fedoraproject.org/wiki/FWN/LatestIssue">${_('News')}</a></li>
           </ul>
+          <!--
           <div py:if="tg.identity.anonymous" id="language">
             <form action="${tg.url('/language')}" method="get">
               <label for="locale">${_('Locale:')}</label>
@@ -73,29 +74,10 @@
               <input type="submit" value="${_('OK')}" />
             </form>
           </div>
+          -->
         </div>
         <div id="content">
-          <div style="
+          <div py:if="tg_flash" class="flash">
-            background: #FF7777;
-            color: #333333;
-            border: 1px solid #555555;
-            padding: 1ex 1ex 0.5ex;
-            float: right;
-            width: 57ex;
-            margin: 1ex 1ex 1ex 2ex;
-            ">
-            <div style="font-size: 3ex;"><strong>Warning:</strong> This is a test instance!</div>
-            <ul style="
-            font-size: 2ex;
-            list-style: square;
-            padding-left: 3ex;
-            ">
-            <li>Avoid entering private info here.</li>
-            <li>The database may be wiped/rebuilt periodically.</li>
-            <li>Feel free to file bugs, enhancements, etc. at <a href="https://fedorahosted.org/fas2/">https://fedorahosted.org/fas2/</a></li>
-            </ul>
-          </div>
-          <div py:if="tg_flash" class="flash" style="margin-right: 62ex">
             ${tg_flash}
           </div>
           <div py:replace="select('*|text()')" />