Update 0.3.12

GibbonEdu · Mar 26, 2015 · d448e4f · d448e4f
1 parent c6ba630
commit d448e4f
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 12 deletions.
diff --git a/CHANGEDB.php b/CHANGEDB.php
@@ -132,4 +132,10 @@
 $sql[$count][1]="
 " ;
 
+//v0.3.12
+$count++;
+$sql[$count][0]="0.3.12" ;
+$sql[$count][1]="
+" ;
+
 ?>
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -141,6 +141,9 @@ Fixed breadcrumbs on multiple files.
 
 v0.3.11
 -------
-Combind text links with image links.
+Combined text links with image links.
 Fixed a double notification bug.
-Added Issue Name to end of notification.
+Added Issue Name to end of notification.
+
+v0.3.12
+-------
diff --git a/issues_discussPostProccess.php b/issues_discussPostProccess.php
@@ -84,18 +84,18 @@
     break ;
   }
 
-$isTech = isTechnician($_SESSION[$guid]["gibbonPersonID"], $connection2) && !isPersonsIssue($connection2, $issueID, $_SESSION[$guid]["gibbonPersonID"]) || getPermissionValue($connection2, $_SESSION[$guid]["gibbonPersonID"], "resolveIssue");
+$isTech = isTechnician($_SESSION[$guid]["gibbonPersonID"], $connection2) && !isPersonsIssue($connection2, $issueID, $_SESSION[$guid]["gibbonPersonID"]);
 
-  $message = "A new message has been left for you";
+  $message = "A new message has been left for you ";
   if($isTech) {
-  	$message.= " by the technician working on your issue";
+  	$message.= "by the technician working on your issue";
   }
   else {
-  	$message.= " by the person who has the issue";
+  	$message.= "by the person who has the issue";
   }
 
 
-  $message.="(" . $row["issueName"] . ").";
+  $message.=" (" . $row["issueName"] . ").";
   $personID = 0000000000;
   if($isTech) {
       $personID = getOwnerOfIssue($connection2, $issueID);

diff --git a/issues_discussView.php b/issues_discussView.php
@@ -174,8 +174,10 @@
     if($array2[0]["technicianID"]==null && (!relatedToIssue($connection2, $_GET["issueID"], $_SESSION[$guid]["gibbonPersonID"]) || getPermissionValue($connection2, $_SESSION[$guid]["gibbonPersonID"], "fullAccess"))) {
       print "<tr>";
         print "<td class='right'>";
-      	  print "<a href='" . $_SESSION[$guid]["absoluteURL"] . "/modules/" . $_SESSION[$guid]["module"] . "/issues_acceptProcess.php?issueID=". $issueID . "'>" .  _('Accept');
-          print "<img title=" . _('Accept ') . "' src='" . $_SESSION[$guid]["absoluteURL"] . "/themes/" . $_SESSION[$guid]["gibbonThemeName"] . "/img/page_new.png'/></a>";
+      	  if(getPermissionValue($connection2, $_SESSION[$guid]["gibbonPersonID"], "assignIssue")) { print "<a href='" . $_SESSION[$guid]["absoluteURL"] . "/modules/" . $_SESSION[$guid]["module"] . "/issues_acceptProcess.php?issueID=". $issueID . "'>" .  _('Accept');
+          	print "<img title=" . _('Accept ') . "' src='" . $_SESSION[$guid]["absoluteURL"] . "/themes/" . $_SESSION[$guid]["gibbonThemeName"] . "/img/page_new.png'/></a>"; }
+          if(getPermissionValue($connection2, $_SESSION[$guid]["gibbonPersonID"], "assignIssue")) { print "<a href='" . $_SESSION[$guid]["absoluteURL"] . "/index.php?q=/modules/" . $_SESSION[$guid]["module"] . "/issues_assign.php&issueID=". $issueID . "'>" .  _('Assign');
+          print "<img style='margin-left: 5px' title=" . _('Assign ') . "' src='" . $_SESSION[$guid]["absoluteURL"] . "/themes/" . $_SESSION[$guid]["gibbonThemeName"] . "/img/attendance.png'/></a>"; }
         print "</td>";
       print "</tr>";
     }

diff --git a/manifest.php b/manifest.php
@@ -25,7 +25,7 @@
 $entryURL="issues_view.php" ;
 $type="Additional" ;
 $category="Other" ;
-$version="0.3.11" ;
+$version="0.3.12" ;
 $author="Adrien Tremblay & Ray Clark" ;
 $url="https://github.com/raynichc/helpdesk" ;
 

diff --git a/moduleFunctions.php b/moduleFunctions.php
@@ -110,7 +110,7 @@ function notifyTechnican($connection2, $guid, $issueID, $name) {
   }
 
   while($row = $result->fetch()) {
-  	setNotification($connection2, $guid, $row["gibbonPersonID"], "A new issue has been added(" . $name . ").", "Help Desk", "/index.php?q=/modules/Help Desk/issues_discussView.php&issueID=" . $issueID);
+  	if($row["gibbonPersonID"] != $_SESSION[$guid]["gibbonPersonID"]) setNotification($connection2, $guid, $row["gibbonPersonID"], "A new issue has been added (" . $name . ").", "Help Desk", "/index.php?q=/modules/Help Desk/issues_discussView.php&issueID=" . $issueID);
   }
 }
 

diff --git a/version.php b/version.php
@@ -20,7 +20,7 @@
 /**
  * Sets version information
  */
-$moduleVersion="0.3.11" ;
+$moduleVersion="0.3.12" ;
 
 /*
 */
-Original file line number
+Diff line change
@@ Expand Up @@
       }
       while($row = $result->fetch()) {
-      	setNotification($connection2, $guid, $row["gibbonPersonID"], "A new issue has been added(" . $name . ").", "Help Desk", "/index.php?q=/modules/Help Desk/issues_discussView.php&issueID=" . $issueID);
+      	if($row["gibbonPersonID"] != $_SESSION[$guid]["gibbonPersonID"]) setNotification($connection2, $guid, $row["gibbonPersonID"], "A new issue has been added (" . $name . ").", "Help Desk", "/index.php?q=/modules/Help Desk/issues_discussView.php&issueID=" . $issueID);
       }
     }
@@ Expand Down @@