Revision bfe23b13 snf-astakos-app/astakos/im/templates/im/projects/project_detail.html

b/snf-astakos-app/astakos/im/templates/im/projects/project_detail.html
84 84
		 	<dt>End Date</dt>
85 85
		 	<dd>{{object.definition.end_date|date:"d/m/Y"}}&nbsp;</dd>
86 86
		 	<dt>Status</dt>
87
		 	<dd>{{ object.status }}</dd>
87
		 	<dd>{{ object.state }}</dd>
88 88
		 	<dt>Owner</dt>
89 89
		 	<dd>{% if user == object.owner %}
90 90
                        Me
......
158 158
                    <select name="sorting" onchange="this.form.submit();" class="dropkicked">
159 159
                        <option value="person__email" {% if sorting == 'person__email' %}selected{% endif %}>Sort by User Id</option>
160 160
                        <option value="person__first_name" {% if sorting == 'person__first_name' %}selected{% endif %}>Sort by Name</option>
161
                        <option value="date_joined" {% if sorting == 'date_joined' %}selected{% endif %}>Sort by Status</option>
161
                        <option value="acceptance_date" {% if sorting == 'acceptance_date' %}selected{% endif %}>Sort by Acceptance Date</option>
162 162
                    </select>
163 163
                </div>
164 164
            </form>
......
189 189
                        <td>Pending
190 190
                            {% if user == object.owner %}
191 191
                                <a href="{% url project_approve_member object.id m.person.id %}?{% if page %}page={{ page }}{% endif %}{% if sorting %}&sorting={{sorting}}{% endif %}">Accept</a>
192
                                <a href="{% url project_remove_member object.id m.person.id  %}?{% if page %}page={{ page }}{% endif %}{% if sorting %}&sorting={{sorting}}{% endif %}">Remove</a>
192
                                <a href="{% url project_reject_member object.id m.person.id  %}?{% if page %}page={{ page }}{% endif %}{% if sorting %}&sorting={{sorting}}{% endif %}">Reject</a>
193 193
                            {% endif %}
194 194
                        </td>    
195 195
                        {% endif %}

Also available in: Unified diff