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 - 0.4-1 +- added fas.conf will fix later. + +* Mon Mar 10 2008 Mike McGrath - 0.3-1 +- Upstream released a new version. + * Mon Mar 10 2008 Mike McGrath - 0.2-1 - Added fas user/group 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) 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: 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 @@
  • ${_('Apply For a new Group')}
  • ${_('News')}
  • +
    -
    -
    Warning: This is a test instance!
    -
      -
    • Avoid entering private info here.
    • -
    • The database may be wiped/rebuilt periodically.
    • -
    • Feel free to file bugs, enhancements, etc. at https://fedorahosted.org/fas2/
    • -
    -
    -
    +
    ${tg_flash}