Fixed server copy/rename/delete to allow more flexible naming

IUREDCap · Nov 29, 2018 · 29bd70b · 29bd70b
1 parent 601e5d6
commit 29bd70b
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 28 deletions.
diff --git a/resources/servers.js b/resources/servers.js
@@ -11,13 +11,7 @@ $(function() {
  },
  title: "Copy server"
  });
- $(".copyServer").click(function(){
- var id = this.id;
- var server = id.substring(5);
- $("#server-to-copy").text('"'+server+'"');
- $('#copy-from-server-name').val(server);
- $("#copy-form").data('server', server).dialog("open");
- });
+
 
  // Rename server form
  renameForm = $("#rename-form").dialog({
@@ -32,14 +26,6 @@ $(function() {
  title: "Rename server"
  });
 
- $(".renameServer").click(function(){
- var id = this.id;
- var server = id.substring(7);
- $("#server-to-rename").text('"'+server+'"');
- $('#rename-server-name').val(server);
- $("#rename-form").data('server', server).dialog("open");
- });
-
 
  // Delete server form
  deleteForm = $("#delete-form").dialog({
@@ -53,12 +39,26 @@ $(function() {
  },
  title: "Delete server"
  });
-
- $(".deleteServer").click(function(){
- var id = this.id;
- var server = id.substring(7);
- $("#server-to-delete").text('"'+server+'"');
- $('#delete-server-name').val(server);
- $("#delete-form").data('server', server).dialog("open");
- });
 });
+
+
+function copyServer(event) {
+ var server = event.data.server;
+ $("#server-to-copy").text('"'+server+'"');
+ $('#copy-from-server-name').val(server);
+ $("#copy-form").data('server', server).dialog("open");
+}
+
+function renameServer(event) {
+ var server = event.data.server;
+ $("#server-to-rename").text('"'+server+'"');
+ $('#rename-server-name').val(server);
+ $("#rename-form").data('server', server).dialog("open");
+}
+
+function deleteServer(event) {
+ var server = event.data.server;
+ $("#server-to-delete").text('"'+server+'"');
+ $('#delete-server-name').val(server);
+ $("#delete-form").data('server', server).dialog("open");
+}
diff --git a/web/admin/servers.php b/web/admin/servers.php
@@ -136,17 +136,17 @@
  ."</td>\n";
 
  print '<td style="text-align:center;">'
- .'<img src="'.APP_PATH_IMAGES.'page_copy.png" id="copy-'.$server.'"'
+ .'<img src="'.APP_PATH_IMAGES.'page_copy.png" id="copyServer'.$row.'"'
  .' class="copyServer" style="cursor: pointer;">'
  ."</td>\n";
 
  print '<td style="text-align:center;">'
- .'<img src="'.APP_PATH_IMAGES.'page_white_edit.png" id="rename-'.$server.'"'
+ .'<img src="'.APP_PATH_IMAGES.'page_white_edit.png" id="renameServer'.$row.'"'
  .' class="renameServer" style="cursor: pointer;">'
  ."</td>\n";
 
  print '<td style="text-align:center;">'
- .'<img src="'.APP_PATH_IMAGES.'delete.png" id="delete-'.$server.'"'
+ .'<img src="'.APP_PATH_IMAGES.'delete.png" id="deleteServer'.$row.'"'
  .' class="deleteServer" style="cursor: pointer;">'
  ."</td>\n";
 
@@ -214,5 +214,22 @@
  </form>
 </div>
 
+<?php
+
+#-----------------------------------------------------------------------
+# Set up click event handlers for the server copy/rename/delete buttons
+#-----------------------------------------------------------------------
+echo "<script>\n";
+
+$row = 1;
+foreach ($servers as $server) {
+ echo '$("#copyServer'.$row.'").click({server: "'.$server.'"}, copyServer);'."\n";
+ echo '$("#renameServer'.$row.'").click({server: "'.$server.'"}, renameServer);'."\n";
+ echo '$("#deleteServer'.$row.'").click({server: "'.$server.'"}, deleteServer);'."\n";
+ $row++;
+}
+
+echo "</script>\n";
+?>
 
 <?php include APP_PATH_DOCROOT . 'ControlCenter/footer.php'; ?>
diff --git a/web/index.php b/web/index.php
@@ -299,7 +299,7 @@ function copyConfig(event) {
  });
 
  <?php
- # Set up click event handlers for the Copy Configuration buttons
+ # Set up click event handlers for the Rename Configuration buttons
  $row = 1;
  foreach ($configurationNames as $configurationName) {
  echo '$("#renameConfig'.$row.'").click({configName: "'.$configurationName.'"}, renameConfig);'."\n";
@@ -353,7 +353,7 @@ function renameConfig(event) {
  });
 
  <?php
- # Set up click event handlers for the Copy Configuration buttons
+ # Set up click event handlers for the Delete Configuration buttons
  $row = 1;
  foreach ($configurationNames as $configurationName) {
  echo '$("#deleteConfig'.$row.'").click({configName: "'.$configurationName.'"}, deleteConfig);'."\n";