Merge pull request #124 from uNiversaI/master

fix issue #123
slash2009 · Jan 24, 2015 · be8206a · be8206a
2 parents c7c2d9c + 1ab9fd5
commit be8206a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/addon.xml b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="webinterface.WIMM"
-  version="4.1.14"
+  version="4.1.15"
   name="WIMM"
   provider-name="slash | Zernable | MokuJinJin | nwtn | fyfe | criticalfiction">
   <requires>

diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,8 @@
 # WIMM Change log
 
+4.1.15
+ - Fix genre rules operator 
+
 4.1.14
  - Fix music genre field not being split correctly (Issue #120)
  - Rename minor id fields now correctly show WIMM

diff --git a/resources/js/app/common/genre.js b/resources/js/app/common/genre.js
@@ -87,7 +87,7 @@ Ext.ns('WIMM.video');
             method: readMethod,
             params: {
                 properties: ['genre'],
-                filter: { field: 'genre', operator: 'contains', value: oldGenre }
+                filter: { field: 'genre', operator: 'is', value: oldGenre }
             },
             id: 'WIMM'
         };

diff --git a/resources/js/app/common/global.js b/resources/js/app/common/global.js
@@ -22,7 +22,7 @@
  * along with WIMM.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var myVersion = '4.1.14';
+var myVersion = '4.1.15';
 
 /**
  * Protect window.console method calls, e.g. console is not defined on IE

diff --git a/resources/js/app/movies/moviegenre.js b/resources/js/app/movies/moviegenre.js
@@ -99,7 +99,7 @@ var movieGrid = new Ext.grid.GridPanel({
                         select: function(combo, record, index) {
                             storeMovie.load({ params: { filter: {
                                 field: 'genre',
-                                operator: 'contains',
+                                operator: 'is',
                                 value: record.data.label
                             } } });
                         }

diff --git a/resources/js/app/movies/movieset.js b/resources/js/app/movies/movieset.js
@@ -72,7 +72,7 @@ Ext.ns('WIMM.video');
             jsonrpc: '2.0',
             method: 'VideoLibrary.GetMovies',
             params: {
-                filter: { field: 'set', operator: 'contains', value: oldMovieSet }
+                filter: { field: 'set', operator: 'is', value: oldMovieSet }
             },
             id: 'WIMM'
         };