Merge branch 'master' of github.com:opendcim/openDCIM

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,43 @@
+---
+name: Bug report
+about: Create a report to help us improve. If you have a question please check if it has been asked under discussions, first.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Were you able to reproduce this on the dev or demo sites?**
+* https://demo.opendcim.org
+* https://dev.opendcim.org
+
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/workflows/opendcim.yml

@@ -0,0 +1,16 @@
+name: openDCIM
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: self-hosted
+
+    steps:
+      - name: Update translations
+        run: /home/runner/update
+

api/v1/deleteRoutes.php

@@ -79,7 +79,8 @@ function updatedevice($deviceid){
 	}
 
 	// If this port isn't the last port then we're gonna shuffle ports to keep the ids in orderish
-	$lastport=end($pp->getPorts());
+	$portlist=$pp->getPorts();
+	$lastport=end($portlist);
 	if($lastport->PortNumber!=$pp->PortNumber){
 		foreach($lastport as $prop=>$value){
 			if($prop!="PortNumber"){

classes/PowerDistribution.class.php

@@ -631,7 +631,7 @@ function GetAllBreakerPoles() {
 				if($panel->NumberScheme=="Odd/Even") {
 						$adder = $i*2;
 				}
-				$next = $this->PanelPole+$adder;
+				$next = intval($this->PanelPole)+$adder;
 				$ret = $ret . "-$next";
 			}
 			return $ret;

classes/PowerPorts.class.php

@@ -102,11 +102,11 @@ function createPort($ignore_errors=false) {
 			PortNumber=$this->PortNumber, Label=\"$this->Label\", 
 			ConnectedDeviceID=$this->ConnectedDeviceID, ConnectedPort=$this->ConnectedPort, 
 			Notes=\"$this->Notes\";";
-
-		if(!$dbh->query($sql) && !$ignore_errors){
-			$info=$dbh->errorInfo();
 
-			error_log("createPort::PDO Error: {$info[2]} SQL=$sql");
+		try{
+			$dbh->query($sql);
+		}catch(PDOException $e){
+			error_log("createPort::PDO Error: {$e->getMessage()}");
 			return false;
 		}