Bugfix

jeedom · Jul 14, 2016 · d45278f · d45278f
1 parent 2c384bb
commit d45278f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/core/repo/market.repo.php b/core/repo/market.repo.php
@@ -317,6 +317,28 @@ public static function getInfo($_logicalId, $_version = 'stable') {
 
 	/*     * ***********************UTILS*************************** */
 
+	public static function saveTicket($_ticket) {
+		$jsonrpc = self::getJsonRpc();
+		$_ticket['user_plugin'] = '';
+		foreach (plugin::listPlugin() as $plugin) {
+			$_ticket['user_plugin'] .= $plugin->getId();
+			$update = $plugin->getUpdate();
+			if (is_object($update)) {
+				$_ticket['user_plugin'] .= '[' . $update->getConfiguration('version', 'stable') . ',' . $update->getLocalVersion() . ']';
+			}
+			$_ticket['user_plugin'] .= ',';
+		}
+		trim($_ticket['user_plugin'], ',');
+		if (isset($_ticket['options']['page'])) {
+			$_ticket['options']['page'] = substr($_ticket['options']['page'], strpos($_ticket['options']['page'], 'index.php'));
+		}
+		$_ticket['options']['jeedom_version'] = jeedom::version();
+		if (!$jsonrpc->sendRequest('ticket::save', array('ticket' => $_ticket))) {
+			throw new Exception($jsonrpc->getErrorMessage());
+		}
+		return $jsonrpc->getResult();
+	}
+
 	public static function getPassword() {
 		$password = config::byKey('market::password');
 		if (!is_sha1($password)) {

diff --git a/desktop/modal/report.bug.php b/desktop/modal/report.bug.php
@@ -115,7 +115,7 @@
                 return;
             }
             $('#bt_sendBugReport').hide();
-            $('#div_alertReportBug').showAlert({message: '{{Votre ticket a bien été ouvert. Un mail va vous être envoyé.}}', level: 'success'});
+            $('#div_alertReportBug').showAlert({message: '{{Votre ticket a bien été ouvert. Nous vous recontacterons prochainement.}}', level: 'success'});
         }
     });
     });

diff --git a/desktop/modal/update.list.php b/desktop/modal/update.list.php
@@ -2,7 +2,7 @@
 if (!isConnect('admin')) {
 	throw new Exception('{{401 - Accès non autorisé}}');
 }
-$repo = update::repoById(init('repo'));
+$repo = update::repoById(init('repo', 'market'));
 if ($repo['enable'] == 0) {
 	throw new Exception(__('Le repository est inactif : ', __FILE__) . init('repo'));
 }