From 3ef9987baa6f6fc0bd6314064461907ce7b47006 Mon Sep 17 00:00:00 2001 From: uNiversaI Date: Mon, 12 Jan 2015 21:13:07 +0900 Subject: [PATCH 1/2] fix #123 --- resources/js/app/common/genre.js | 2 +- resources/js/app/movies/moviegenre.js | 2 +- resources/js/app/movies/movieset.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/js/app/common/genre.js b/resources/js/app/common/genre.js index 97f2b4e..40c2ac7 100644 --- 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/movies/moviegenre.js b/resources/js/app/movies/moviegenre.js index 7e88b9a..06a7dbb 100644 --- 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 index 333f6c0..4f5b75d 100644 --- 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' }; From 1ab9fd5b4f550c6644111c1635f3b4e703aacf30 Mon Sep 17 00:00:00 2001 From: uNiversaI Date: Mon, 12 Jan 2015 21:20:29 +0900 Subject: [PATCH 2/2] bump after fix #124 for release --- addon.xml | 2 +- changelog.txt | 3 +++ resources/js/app/common/global.js | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/addon.xml b/addon.xml index 47d7438..a25b9f3 100644 --- a/addon.xml +++ b/addon.xml @@ -1,7 +1,7 @@ diff --git a/changelog.txt b/changelog.txt index 67eb6a3..2297dc3 100644 --- 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/global.js b/resources/js/app/common/global.js index 622f551..d8aaaf3 100644 --- a/resources/js/app/common/global.js +++ b/resources/js/app/common/global.js @@ -22,7 +22,7 @@ * along with WIMM. If not, see . */ -var myVersion = '4.1.14'; +var myVersion = '4.1.15'; /** * Protect window.console method calls, e.g. console is not defined on IE