Merge branch 'master' of http://code.brln.tv/diffusion/ARCH/archilance into mukhtar

assets/css/main.css

@@ -827,9 +827,8 @@ footer:after {
     box-shadow: 0 0 10px rgba(0,0,0,0.7);
 }
 
-.projectPro:hover .titlePro {
-    color: #fb2c2d;
-    text-decoration: underline;
+.titlePro a:hover {
+    text-decoration: underline !important;
 }
 
 .projectPro:hover .leftPro:before {
@@ -5998,7 +5997,7 @@ a.linkS2[data-target="#withdraw-money"]{
 }
 
 input[type="radio"]{
-    opacity: 1;
+    opacity: 0;
 }
 
 .wr-inset-pluss{
@@ -6046,4 +6045,8 @@ input[type="radio"]{
     -moz-transform: scale(1.04);
     transform: scale(1.04);
 }
+.new-rass2 .btn-submit-link{
+    display: table;
+    margin: 15px 0px 15px -15px !important;
+}
 /*end_new*/

assets/index.js

@@ -51,7 +51,8 @@ $('[data-tooltip]').tooltip({
                     results: _.map(function(item) {
                         return {
                             id: item.id,
-                            text: item.name,
+                            //text: item.name,
+                            text: _.repeat(item.level-1, '---') + item.name,
                             origItem: item,
                         }
                     }, data.results),

users/templates/contractor_profile.html

@@ -474,7 +474,7 @@
                                                             {% thumbnail diplom.img "210x334" crop="center" as im %}
                                                                 <div class="imgGal"
                                                                      style="background: url('{{ im.url }}') no-repeat center;">
-                                                                    <a href="{{ im.url }}" class='open-modal-image'>
+                                                                    <a href="{{ diplom.img.url }}" class='open-modal-image'>
                                                                       <div class="imgFigure"></div>
                                                                     </a>
                                                                 </div>
@@ -514,7 +514,7 @@
                                                             {% thumbnail cro.img "210x334" crop="center" as im %}
                                                                 <div class="imgGal"
                                                                      style="background: url('{{ im.url }}') no-repeat center;">
-                                                                    <a href="{{ im.url }}" class='open-modal-image'>
+                                                                    <a href="{{ cro.img.url }}" class='open-modal-image'>
                                                                       <div class="imgFigure"></div>
                                                                     </a>
                                                                 </div>
@@ -968,6 +968,15 @@
                     $("#resume-success").html("");
                     var formData = new FormData();
                     formData.append('resume_file', e.target.files[0]);
+                    
+                    var file = e.target.files[0]
+                    var allowedExts = ['.pdf','.doc','.docx','.xml','.odt','.uot','.dot','.rtf','.txt','.uop','.pptx','.odp','.html']
+                    
+                    if (!_.includes(path.extname(file.name), allowedExts)) {
+                        alert('Файл не подходит. Выберите документ')
+                        return
+                    }
+                    
                     $.ajax({
                         url:'/api/contractorresume/{{ contractor.contractor_resume.pk }}/',
                         method:'PUT',

wallets/signals.py

@@ -65,7 +65,7 @@ def reserve_stages(sender, instance, created, **kwargs):
                 stage.save()
 
         inv_history = InvoiceHistory()
-        inv_history.comment = 'Резервирование средств за этапы ' + ' , '.join(stages_names) + ' заказа' + str(order)
+        inv_history.comment = 'Резервирование средств за этап(ы) ' + ' , '.join(stages_names) + ' заказа ' + str(order)
         inv_history.sum = instance.sum
         inv_history.user = instance.customer
         inv_history.type = "history"
@@ -89,7 +89,7 @@ def reserve_stages_from_score(sender, instance, created, **kwargs):
             stage.save()
 
     inv_history = InvoiceHistory()
-    inv_history.comment = 'Резервирование средств за этапы ' + ' , '.join(stages_names) + ' заказа' + str(order)
+    inv_history.comment = 'Резервирование средств за этап(ы) ' + ' , '.join(stages_names) + ' заказа ' + str(order)
     inv_history.sum = -instance.sum
     inv_history.user = instance.customer
     inv_history.type = "score"

work_sell/templates/worksells_list.html

@@ -22,7 +22,7 @@
                             <div class="col-lg-3">Специализации</div>
                             <div class="col-lg-9"></div>
                         </div>
-                        <div class="polsF1 disTab">
+                        <div class="polsF1 disTab -spec-select-container">
                             <div class="col-lg-3">
                                 <input type="hidden" class="-spec-select -spec-select-level-1" style="width: 100%">
                             </div>
@@ -36,7 +36,7 @@
                                  <input type="hidden" class="-spec-select -spec-select-level-4" style="width: 100%">
                             </div>
 
-                            <input type="hidden" id="chosenSpecId" name="{{ form.specialization.html_name }}" value="{{ form.specialization.value }}">
+                            <input type="hidden" name="{{ form.specialization.html_name }}" value="{{ form.specialization.value }}" class="-chosen-spec-id">
                         </div>