1966: Modification de Offre d'emploi (visualisation)

diff --git a/project/recrutement/admin.py b/project/recrutement/admin.py
index 6806962..4e984fd 100644 (file)
--- a/project/recrutement/admin.py
+++ b/project/recrutement/admin.py
@@ -70,6 +70,7 @@ class OffreEmploiAdmin(VersionAdmin):
         employe = get_emp(request.user)
         user_groupes = request.user.groups.all()
         
+    
         # Region
         if form.declared_fields.has_key('region'):
             region_field = form.declared_fields['region']
@@ -106,6 +107,7 @@ class OffreEmploiAdmin(VersionAdmin):
         else:
             bureau_field.queryset = Bureau.objects.\
                                     filter(region=employe.implantation.region)   
+         
         return form
         
     ### Queryset
@@ -161,16 +163,16 @@ class ProxyOffreEmploiAdmin(OffreEmploiAdmin):
                     'est_affiche')
     readonly_fields = ('description', 'bureau', 'duree_affectation', 
                         'renumeration', 'debut_affectation', 'lieu_affectation',
-                        'nom', 'resume', 'date_limite', 'region')
+                        'nom', 'resume', 'date_limite', 'region', 'poste')
     fieldsets = (
         ('Nom', {
             'fields': ('nom', )        
         }),
         ('Description générale', {
-            'fields': ('resume','description', 'date_limite', )        
+            'fields': ('description', 'date_limite', )        
         }),
         ('Coordonnées', {
-            'fields': ('lieu_affectation', 'bureau', 'region', )
+            'fields': ('lieu_affectation', 'bureau', 'region', 'poste',)
         }),
         ('Autre', {
             'fields': ('debut_affectation', 'duree_affectation',
@@ -187,9 +189,7 @@ class ProxyOffreEmploiAdmin(OffreEmploiAdmin):
 
     ### Lieu de redirection après le change 
     def response_change(self, request, obj):
-        response = super(ProxyOffreEmploiAdmin, self).response_change(request, 
-                                                                            obj)
-
+        response = super(ProxyOffreEmploiAdmin,self).response_change(request,obj)
         return HttpResponseRedirect(reverse\
                             ('admin:recrutement_proxyoffreemploi_changelist'))
 

diff --git a/project/recrutement/forms.py b/project/recrutement/forms.py
index 778e72c..64f694d 100644 (file)
--- a/project/recrutement/forms.py
+++ b/project/recrutement/forms.py
@@ -93,7 +93,6 @@ class OffreEmploiForm(ModelForm):
             if date_limite > debut_affectation:
                 raise forms.ValidationError("La date limite ne peut pas être \
                         supérieure à la date d'affection.")
-
         return cleaned_data
 
 ################################################################################

diff --git a/project/recrutement/templates/admin/recrutement/proxycandidat/change_form.html b/project/recrutement/templates/admin/recrutement/proxycandidat/change_form.html
index f3b5cf0..9e89f77 100644 (file)
--- a/project/recrutement/templates/admin/recrutement/proxycandidat/change_form.html
+++ b/project/recrutement/templates/admin/recrutement/proxycandidat/change_form.html
@@ -65,7 +65,9 @@
 
 {% block after_related_objects %}{% endblock %}
 
-{% submit_row %}
+<div class="submit-row">
+    <a href="../" class="default">Retour</a>
+</div>
 
 {% if adminform and add %}
    <script type="text/javascript">document.getElementById("{{ adminform.first_field.id_for_label }}").focus();</script>

diff --git a/project/recrutement/templates/admin/recrutement/proxyoffreemploi/change_form.html b/project/recrutement/templates/admin/recrutement/proxyoffreemploi/change_form.html
new file mode 100644 (file)
index 0000000..caf772e
--- /dev/null
+++ b/project/recrutement/templates/admin/recrutement/proxyoffreemploi/change_form.html
@@ -0,0 +1,81 @@
+{% extends "admin/base_site.html" %}
+{% load i18n admin_modify adminmedia %}
+
+{% block extrahead %}{{ block.super }}
+{% url admin:jsi18n as jsi18nurl %}
+<script type="text/javascript" src="{{ jsi18nurl|default:"../../../jsi18n/" }}"></script>
+{{ media }}
+{% endblock %}
+
+{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />{% endblock %}
+
+{% block coltype %}{% if ordered_objects %}colMS{% else %}colM{% endif %}{% endblock %}
+
+{% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %}
+
+{% block breadcrumbs %}{% if not is_popup %}
+<div class="breadcrumbs">
+     <a href="../../../">{% trans "Home" %}</a> &rsaquo;
+     <a href="../../">{{ app_label|capfirst|escape }}</a> &rsaquo;
+     {% if has_change_permission %}<a href="../">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} &rsaquo;
+     {% if add %}{% trans "Add" %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %}
+</div>
+{% endif %}{% endblock %}
+
+{% block content %}<div id="content-main">
+{% block object-tools %}
+{% if change %}{% if not is_popup %}
+  <ul class="object-tools"><li><a href="history/" class="historylink">{% trans "History" %}</a></li>
+  {% if has_absolute_url %}<li><a href="../../../r/{{ content_type_id }}/{{ object_id }}/" class="viewsitelink">{% trans "View on site" %}</a></li>{% endif%}
+  </ul>
+{% endif %}{% endif %}
+{% endblock %}
+<form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="" id="{{ opts.module_name }}_form">{% csrf_token %}{% block form_top %}{% endblock %}
+<div>
+{% if is_popup %}<input type="hidden" name="_popup" value="1" />{% endif %}
+{% if save_on_top %}{% submit_row %}{% endif %}
+{% if errors %}
+    <p class="errornote">
+    {% blocktrans count errors|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}
+    </p>
+    {{ adminform.form.non_field_errors }}
+{% endif %}
+
+{% for fieldset in adminform %}
+  {% include "admin/includes/fieldset.html" %}
+{% endfor %}
+
+{% block after_field_sets %}{% endblock %}
+
+{% for inline_admin_formset in inline_admin_formsets %}
+    {% include inline_admin_formset.opts.template %}
+{% endfor %}
+
+<fieldset class="module aligned ">
+    <h2>Pièces jointes</h2>
+    {% for p in original.pieces_jointes %}
+        <div class="form-row">
+            <label>{{ p.get_nom_display }}:</label>
+            <p><a href="{{ p.path.url }}">{{ p.path.url }}</a></p>
+        </div>
+    {% endfor %}
+</fieldset>
+
+{% block after_related_objects %}{% endblock %}
+
+<div class="submit-row">
+    <a href="../" class="default">Retour</a>
+</div>
+
+
+{% if adminform and add %}
+   <script type="text/javascript">document.getElementById("{{ adminform.first_field.id_for_label }}").focus();</script>
+{% endif %}
+
+{# JavaScript for prepopulated fields #}
+{% prepopulated_fields_js %}
+
+</div>
+</form>
+</div>
+{% endblock %}