From b9190dcbe380ee4d333f5c2d3d189198c1de2a7e Mon Sep 17 00:00:00 2001
From: Ricky Zhou <ricky@fedoraproject.org>
Date: Tue, 11 Mar 2008 13:55:30 -0400
Subject: [PATCH 1/4] Kill the "this is a test" message, hide the locale field
 for now, until we start getting translations.

---
 fas/fas/templates/master.html | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/fas/fas/templates/master.html b/fas/fas/templates/master.html
index d04b222..31f1f83 100644
--- a/fas/fas/templates/master.html
+++ b/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="
-            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">
+          <div py:if="tg_flash" class="flash">
             ${tg_flash}
           </div>
           <div py:replace="select('*|text()')" />

From 803ebf56fe89d72683f67cf57146aae536463f29 Mon Sep 17 00:00:00 2001
From: Ricky Zhou <ricky@fedoraproject.org>
Date: Tue, 11 Mar 2008 14:12:12 -0400
Subject: [PATCH 2/4] I think fasClient looks for a 403 on a failed login.

---
 fas/fas/controllers.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fas/fas/controllers.py b/fas/fas/controllers.py
index 54aa55d..790bd3a 100644
--- a/fas/fas/controllers.py
+++ b/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)

From 7883c1664be36969dd34a8d7d99c1d9dc7b941f2 Mon Sep 17 00:00:00 2001
From: Michael McGrath <mmcgrath@desktop.mmcgrath.net>
Date: Tue, 11 Mar 2008 14:00:15 -0500
Subject: [PATCH 3/4] don't return unapproved people to the shell based servers

---
 fas/fas/group.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fas/fas/group.py b/fas/fas/group.py
index 553fe73..ba88f8b 100644
--- a/fas/fas/group.py
+++ b/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:

From 6923f955a11d95ea7345e96d837d83c6b83f5929 Mon Sep 17 00:00:00 2001
From: Michael McGrath <mmcgrath@desktop.mmcgrath.net>
Date: Tue, 11 Mar 2008 14:02:18 -0500
Subject: [PATCH 4/4] Preping for another release

---
 fas/fas.spec | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/fas/fas.spec b/fas/fas.spec
index 9e177fb..8f2e30c 100644
--- a/fas/fas.spec
+++ b/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