Merge поиск по всем классам

.gitignore

@@ -1,4 +1,11 @@
-static/*
+static/
 *.pyc
+<<<<<<< HEAD
 frontend/static/*
-zsite/static/vendor/*
+zsite/static/vendor/*
+=======
+frontend/static/
+zsite/static/vendor/
+_env/
+media/
+>>>>>>> 7b75258... Поправил поиск по всем классам

trademark/models.py

@@ -116,7 +116,10 @@ class Keyword(models.Model):
 
     @property
     def nice_objects(self):
-        nices = self.nices.split(',')
+        if not self.nices:
+            nices = range(1,46)
+        else:
+            nices = self.nices.split(',')
 
         return Nice.objects.filter(nice_id__in=nices)
 

trademark/static/trademark/js/modal.js

@@ -2,10 +2,9 @@
 angular.module('zuykov')
 
 .controller('ModalTrademarkSearchCtrl', ['$scope', '$modal', '$location', function ($scope, $modal, $location) {
-  var selected_nices = $location.search().nices || false;
   $scope.nice = nicesRu;
-  $scope.classes_values = selected_nices ? selected_nices.split(',') : [];
-  $scope.classes = $scope.classes_values.length;
+  $scope.classes_values = [];
+  $scope.classes = 0;
   $scope.animationsEnabled = true;
   $scope.opened = false;
   $scope.callback = false;
@@ -18,23 +17,18 @@ angular.module('zuykov')
       controller: 'ModalTrademarkSearchInstanceCtrl',
       windowClass: 'trademark-search-modal'
     });
-    $scope.opened = true;
-    $scope.tm_url = false;
 
-    modalInstance.result.then(function (classes_values) {
-      var selected_nices = $location.search().nices || false;
+    console.log($scope.classes, $scope.classes_values);
 
+    modalInstance.result.then(function (classes_values) {
       $scope.classes_values = classes_values;
       $scope.classes = $scope.classes_values.length;
 
-      $scope.opened = false;
-
       if ($scope.callback) {
         $scope.callback();
       }
 
     }, function () {
-      $scope.opened = false;
 
     });
   };
@@ -52,8 +46,9 @@ angular.module('zuykov')
   $scope.categories = nicesCategories;
   $scope.GetNoun = GetNoun;
 
+
   $scope.ok = function () {
-    $modalInstance.close($scope.classes_values);
+    $modalInstance.close($scope.classes_values || []);
   };
 
   $scope.cancel = function () {

trademark/static/trademark/js/nice_ctrl.js

@@ -2,6 +2,8 @@
 angular.module('zuykov')
 
 .controller('TrademarkSearchNiceCtrl', ['$scope', '$rootScope', '$location', function ($scope, $rootScope, $location) {
+    $rootScope.classes_values = [];
+    $rootScope.classes = 0;
 
     $scope.selectedCategory = 1;
 

trademark/static/trademark/js/result.js

@@ -12,13 +12,13 @@ TrademarkSearchResult = (function (resultContainer) {
     }
 
     function prepare_load_more ($container, display_classes) {
-        var results_count = $container.find(".load-more-result.filtered").size(),
+        var results_count = $container.find(".load-more-result.filtered").length,
             showed = 6,
             $this = $container,
             $count = $container.find('.load-more-count'),
             $detail_count = $container.find(".trademark-search-results-detail-count");
 
-        all_count = $container.find(".load-more-result").size();
+        all_count = $container.find(".load-more-result").length;
         total_count += results_count;
 
         function update_count() {

trademark/templates/trademark/modal.html

@@ -74,7 +74,7 @@
 
     {% verbatim %}
     <div>
-        <p class="trademark-search-advanced-count">Поиск происходит {{ classes == 0 ? 'во всех классах' : 'в ' + classes + GetNoun(classes, ' классе', ' классах', ' классах') }}</p>
+        <p class="trademark-search-advanced-count">Поиск происходит {{ classes > 0 ? 'в ' + classes + GetNoun(classes, ' классе', ' классах', ' классах') : 'во всех классах' }}</p>
         <ul class="nice-selected list-unstyled list-inline">
 
             <li ng-repeat="id in classes_values"><span class="label label-default"><strong>{{ nice[id-1].id }}</strong> – {{ nice[id-1].title }}</span></li>

trademark/templates/trademark/nice_block_busy.html

@@ -5,10 +5,10 @@
     <ul class="list-unstyled load-more-results" list-type="nices">
         {% for nice in nice_busy %}
             {% if products_busy|getitem:nice.nice_id|length > 1 %}
-            <li class="trademark-search-nice-busy-product load-more-result c{{ nice.nice_id }}"><button class="btn btn-xs btn-default" popover="{% if nice.description %}{{ nice.description }}{% else %}{{ nice.title }}{% endif %}" popover-title="{{ nice.title }}" popover-trigger="mouseenter" popover-placement="bottom">{{ nice.nice_id }} класс</button>  <button class="btn btn-xs btn-default trademark-search-show-products" product-id="{{ nice.nice_id }}">{{ products_busy|getitem:nice.nice_id|length }} категорий <span class="caret"> </span></button> {{ nice.title }}</li>
+            <li class="trademark-search-nice-busy-product load-more-result c{{ nice.nice_id }}"><button class="btn btn-xs btn-default" popover="{% if nice.description %}{{ nice.description }}{% else %}{{ nice.title }}{% endif %}" popover-title="{{ nice.title }}" popover-trigger="mouseenter" popover-placement="right">{{ nice.nice_id }} класс</button>  <button class="btn btn-xs btn-default trademark-search-show-products" product-id="{{ nice.nice_id }}">{{ products_busy|getitem:nice.nice_id|length }} категорий <span class="caret"> </span></button> {{ nice.title }}</li>
                 <ul class="trademark-search-nice-busy-products row" style="display: none;" product-id="{{ nice.nice_id }}">{% for product in products_busy|getitem:nice.nice_id %}<li class="col-xs-6">{{ product.title }}</li>{% endfor %}</ul>
              {% else %}
-                <li class="trademark-search-nice-busy-product load-more-result"><button class="btn btn-xs btn-default" popover="{% if nice.description %}{{ nice.description }}{% else %}{{ nice.title }}{% endif %}" popover-title="{{ nice.title }}" popover-trigger="mouseenter" popover-placement="bottom">{{ nice.nice_id }} класс</button> {{ products_busy|getitem:nice.nice_id|first }}</li>
+                <li class="trademark-search-nice-busy-product load-more-result"><button class="btn btn-xs btn-default" popover="{% if nice.description %}{{ nice.description }}{% else %}{{ nice.title }}{% endif %}" popover-title="{{ nice.title }}" popover-trigger="mouseenter" popover-placement="right">{{ nice.nice_id }} класс</button> {{ products_busy|getitem:nice.nice_id|first }}</li>
             {% endif %}
 
         {% endfor %}

trademark/templates/trademark/search_detail.html

@@ -3,17 +3,20 @@
 
 {% block title %}Отчёт по поиску товарных знаков на запрос «{{ keyword.request|title }}» — заявки, свидетельства, классы{% endblock %}
 
-
 {% block trademark_content %}
 {% include 'trademark/breadcrumb.html' with keyword=keyword.request %}
 
 <h1>Результаты поиска знаков по запросу «{{ keyword|title }}» в {{ keyword.nice_objects|length }} классах МКТУ</h1>
-<p>Поиск происходил в следуюших классах:</p>
-<ul class="nice-selected list-unstyled list-inline">
-{% for nice in keyword.nice_objects %}
-    <li><span class="label label-default"><strong>{{ nice.nice_id }}</strong> — {{ nice.title }}</span></li>
-{% endfor %}
-</ul>
+{% if keyword.nice_objects|length < 45 %}
+    <p>Поиск происходил в следуюших классах:</p>
+    <ul class="nice-selected list-unstyled list-inline">
+    {% for nice in keyword.nice_objects %}
+        <li><span class="label label-default"><strong>{{ nice.nice_id }}</strong> — {{ nice.title }}</span></li>
+    {% endfor %}
+    </ul>
+{% else %}
+    <p>Поиск происходит во всех классах</p>
+{% endif %}
 
 <div class="row">
     <div class="col-xs-12 col-sm-8">
@@ -39,13 +42,13 @@
             {% if tm.nices.count != 44 %}
                 {% if tm.nices.count > 5 %}
                 <span>{% for class in tm.nices.all|slice:":4" %}
-                <button class="btn btn-xs btn-default trademark-search-nice-button" ng-show="true" popover="{{class.description}}" popover-title="{{class.title}}" popover-trigger="mouseenter" popover-placement="bottom" class="btn btn-xs btn-default">{{ class.nice_id }}</button>
+                <button class="btn btn-xs btn-default trademark-search-nice-button" ng-show="true" popover="{{class.description}}" popover-title="{{class.title}}" popover-trigger="mouseenter" popover-placement="right" class="btn btn-xs btn-default">{{ class.nice_id }}</button>
                 {% endfor %}
-                <button class="btn btn-xs btn-default" popover="{% for class in tm.nices.all|slice:"4:" %}{{class.id}}{% if not forloop.last %} — {% endif %} {% endfor %}" popover-trigger="mouseenter" popover-placement="bottom">...</button>
+                <button class="btn btn-xs btn-default" popover="{% for class in tm.nices.all|slice:"4:" %}{{class.id}}{% if not forloop.last %} — {% endif %} {% endfor %}" popover-trigger="mouseenter" popover-placement="right">...</button>
                 </span>
                 {% else %}
                     <span>{% for class in tm.nices.all %}
-                    <button class="btn btn-xs btn-default trademark-search-nice-button" ng-show="true" popover="{{class.description}}" popover-title="{{class.title}}" popover-trigger="mouseenter" popover-placement="bottom" class="btn btn-xs btn-default">{{ class.nice_id }}</button></span>
+                    <button class="btn btn-xs btn-default trademark-search-nice-button" ng-show="true" popover="{{class.description}}" popover-title="{{class.title}}" popover-trigger="mouseenter" popover-placement="right" class="btn btn-xs btn-default">{{ class.nice_id }}</button></span>
                     {% endfor %}
                 {% endif %}