Merge branch 'feature/tv-fields'

slash2009 · Nov 23, 2014 · 879e8d6 · 879e8d6
2 parents 5be4c92 + 681ee73
commit 879e8d6
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 12 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,7 +1,9 @@
 [B]WIMM Change log[/B]
 
 4.1.11
-
+ - Add support for tags to TV shows
+ - Add sort title for TV shows
+ - Add content rating for TV shows
 
 4.1.10
  - Revert JSON API version to 6.14.3

diff --git a/resources/js/app/tvshows/tvshow.js b/resources/js/app/tvshows/tvshow.js
@@ -31,20 +31,22 @@ function fanartConvert(value, record) {
 }
 
 var tvShowRecord = Ext.data.Record.create([
+   { name: 'tvshowid' },
    { name: 'title' },
+   { name: 'sorttitle' },
    { name: 'genre', convert: XWMM.util.convertArrayToList },
    { name: 'year' },
+   { name: 'rating', convert: XWMM.util.convertRating },
    { name: 'plot' },
-   { name: 'fanart', mapping: 'art', convert: fanartConvert },
-   { name: 'banner', mapping: 'art', convert: bannerConvert },
-   { name: 'tvshowid' },
    { name: 'studio', convert: XWMM.util.convertArrayToList },
+   { name: 'mpaa' },
+   { name: 'playcount' },
    { name: 'episode' },
-   { name: 'rating', convert: XWMM.util.convertRating },
    { name: 'premiered' },
-   { name: 'tvshowid' },
-   { name: 'playcount' },
-   { name: 'watchedepisodes' }
+   { name: 'fanart', mapping: 'art', convert: fanartConvert },
+   { name: 'banner', mapping: 'art', convert: bannerConvert },
+   { name: 'watchedepisodes' },
+   { name: 'tag', convert: XWMM.util.convertArrayToList }
 ]);
 
 var seasonRecord = Ext.data.Record.create([
@@ -81,9 +83,9 @@ var storeTVShow = new Ext.data.Store({
             method: 'VideoLibrary.GetTVShows',
             params: {
                 properties: [
-                    'title', 'genre', 'year', 'rating', 'plot', 'studio', 'mpaa', 'playcount',
+                    'title', 'sorttitle', 'genre', 'year', 'rating', 'plot', 'studio', 'mpaa', 'playcount',
                     'episode', 'imdbnumber', 'premiered', 'votes', 'lastplayed', 'art', 'file',
-                    'watchedepisodes'
+                    'watchedepisodes', 'tag'
                 ],
                 sort: {
                     order: 'ascending',
@@ -210,7 +212,7 @@ var tvShowDetailsPanel = new Ext.FormPanel({
                 {
                     columnWidth: 0.40,
                     layout: 'form',
-                    labelWidth: 65,
+                    labelWidth: 85,
                     padding: '0 10px',
                     defaults: {
                         xtype: 'textfield',
@@ -228,6 +230,10 @@ var tvShowDetailsPanel = new Ext.FormPanel({
                             name: 'title',
                             allowBlank: false
                         },
+                        {
+                            fieldLabel: 'Sort Title',
+                            name: 'sorttitle'
+                        },
                         {
                             fieldLabel: 'Genres',
                             name: 'genre',
@@ -241,6 +247,14 @@ var tvShowDetailsPanel = new Ext.FormPanel({
                         {
                             fieldLabel: 'Channel',
                             name: 'studio'
+                        },
+                        {
+                            fieldLabel: 'Content Rating',
+                            name: 'mpaa'
+                        },
+                        {
+                            fieldLabel: 'Tags',
+                            name: 'tag'
                         }
                     ]
                 },
@@ -250,7 +264,7 @@ var tvShowDetailsPanel = new Ext.FormPanel({
                     name: 'plot',
 
                     columnWidth: 0.40,
-                    height: 100,
+                    height: 175,
 
                     listeners: {
                         change: function() {