瀏覽代碼

fixes #146 - User creation screen - image selection

Luke Pulverenti 12 年之前
父節點
當前提交
5ae162fb21
共有 2 個文件被更改,包括 10 次插入6 次删除
  1. 9 5
      MediaBrowser.WebDashboard/ApiClient.js
  2. 1 1
      MediaBrowser.WebDashboard/packages.config

+ 9 - 5
MediaBrowser.WebDashboard/ApiClient.js

@@ -786,7 +786,11 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
                 throw new Error("null imageType");
                 throw new Error("null imageType");
             }
             }
 
 
-            if (!file || !file.type.match('image.*')) {
+            if (!file) {
+                throw new Error("File must be an image.");
+            }
+
+            if (file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/jpeg") {
                 throw new Error("File must be an image.");
                 throw new Error("File must be an image.");
             }
             }
 
 
@@ -1841,7 +1845,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
                 throw new Error("null name");
                 throw new Error("null name");
             }
             }
 
 
-            var url = self.getUrl("Users/{UserId}/Persons/" + encodeName(name) + "/Counts");
+            var url = self.getUrl("Users/" + userId + "/Persons/" + encodeName(name) + "/Counts");
 
 
             return self.ajax({
             return self.ajax({
                 type: "GET",
                 type: "GET",
@@ -1863,7 +1867,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
                 throw new Error("null name");
                 throw new Error("null name");
             }
             }
 
 
-            var url = self.getUrl("Users/{UserId}/Genres/" + encodeName(name) + "/Counts");
+            var url = self.getUrl("Users/" + userId + "/Genres/" + encodeName(name) + "/Counts");
 
 
             return self.ajax({
             return self.ajax({
                 type: "GET",
                 type: "GET",
@@ -1875,7 +1879,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
         /**
         /**
             Gets a variety of item counts that a studio appears in
             Gets a variety of item counts that a studio appears in
         */
         */
-        self.getStudiosItemCounts = function (userId, name) {
+        self.getStudioItemCounts = function (userId, name) {
 
 
             if (!userId) {
             if (!userId) {
                 throw new Error("null userId");
                 throw new Error("null userId");
@@ -1885,7 +1889,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
                 throw new Error("null name");
                 throw new Error("null name");
             }
             }
 
 
-            var url = self.getUrl("Users/{UserId}/Studios/" + encodeName(name) + "/Counts");
+            var url = self.getUrl("Users/" + userId + "/Studios/" + encodeName(name) + "/Counts");
 
 
             return self.ajax({
             return self.ajax({
                 type: "GET",
                 type: "GET",

+ 1 - 1
MediaBrowser.WebDashboard/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
 <packages>
-  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.78" targetFramework="net45" />
+  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.79" targetFramework="net45" />
   <package id="ServiceStack.Common" version="3.9.43" targetFramework="net45" />
   <package id="ServiceStack.Common" version="3.9.43" targetFramework="net45" />
   <package id="ServiceStack.Text" version="3.9.43" targetFramework="net45" />
   <package id="ServiceStack.Text" version="3.9.43" targetFramework="net45" />
 </packages>
 </packages>