diff options
| author |   Joachim Filip Ignacy Bartosik <jbartosik@gmail.com> | 2011-05-25 14:38:17 +0200 |
|---|---|---|
| committer |   Petteri Räty <petsku@petteriraty.eu> | 2011-06-05 23:40:55 +0300 |
| commit | 8f5097eeccad507935df12fd426e1cbe953412da (patch) | |
| tree | 819cc53fd1d866ab948bd6f9962d3587e8787fb6 /site/app | |
| parent | Bugfix: broken agenda initializer (diff) | |
| download | council-webapp-8f5097eeccad507935df12fd426e1cbe953412da.tar.gz council-webapp-8f5097eeccad507935df12fd426e1cbe953412da.tar.bz2 council-webapp-8f5097eeccad507935df12fd426e1cbe953412da.zip | |
Bugfix - agenda items management
Don't list rejected agenda items
Don't show "Reject" and "Add to current agenda" buttons on pages showing
item already in agenda.
Diffstat (limited to 'site/app')
| -rw-r--r-- | site/app/views/agenda_items/show.dryml | 2 | ||||
| -rw-r--r-- | site/app/views/agendas/show.dryml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/site/app/views/agenda_items/show.dryml b/site/app/views/agenda_items/show.dryml index ba27673..1713266 100644 --- a/site/app/views/agenda_items/show.dryml +++ b/site/app/views/agenda_items/show.dryml @@ -1,6 +1,6 @@ <show-page> <append-content:> - <form if="&this.editable_by?(current_user, :agenda)"> + <form if="&this.editable_by?(current_user, :agenda) and this.agenda.nil?"> <input value="&Agenda.current.id" type="hidden" name="agenda_item[agenda_id]"/> <submit label="Add to current agenda"/> </form> diff --git a/site/app/views/agendas/show.dryml b/site/app/views/agendas/show.dryml index 113edb4..40a413e 100644 --- a/site/app/views/agendas/show.dryml +++ b/site/app/views/agendas/show.dryml @@ -3,7 +3,7 @@ <h3 class="collection-heading"> Suggested items: </h3> - <with with="&AgendaItem.all(:conditions => { :agenda_id => nil })"> + <with with="&AgendaItem.all(:conditions => { :agenda_id => nil, :rejected => false })"> <collection unless="&this.nil?" /> </with> </append-collection-section:> |