Little cleanup

wildstray · Aug 21, 2011 · 9183399 · 9183399
1 parent 9b73d1d
commit 9183399
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/describe_columnfamily.php b/describe_columnfamily.php
@@ -103,6 +103,8 @@
 
 				$vw_vars['is_counter_column'] = $vw_cf_vars['default_validation_class'] == 'org.apache.cassandra.db.marshal.CounterColumnType';
 
+				$vw_vars['is_read_only_keyspace'] = isReadOnlyKeyspace($keyspace_name);
+
 				echo getHTML('describe_columnfamily.php',$vw_vars);
 			}
 			else {

diff --git a/describe_keyspace.php b/describe_keyspace.php
@@ -60,7 +60,7 @@
 			$vw_vars['ring'] = array();
 			$vw_vars['list_column_families'] = '';
 
-			$vw_vars['is_readonly_keyspace'] = isReadyOnlyKeyspace($keyspace_name);
+			$vw_vars['is_read_only_keyspace'] = isReadOnlyKeyspace($keyspace_name);
 
 			$nb_cfs = count($describe_keyspace->cf_defs);
 			if ($nb_cfs == 0) {

diff --git a/include/kernel.inc.php b/include/kernel.inc.php
@@ -132,7 +132,7 @@ function getPageTitle() {
 		Return true if a keyspace is read-only, false otherwise
 	*/
 
-	function isReadyOnlyKeyspace($keyspace_name) {
+	function isReadOnlyKeyspace($keyspace_name) {
 		return in_array($keyspace_name,explode(',',READ_ONLY_KEYSPACES));
 	}
 

diff --git a/views/columnfamily_details.php b/views/columnfamily_details.php
@@ -1,7 +1,7 @@
 <?php if ($show_edit_link): ?>
 	<h4>
 		<a href="describe_columnfamily.php?keyspace_name=<?php echo $keyspace_name; ?>&amp;columnfamily_name=<?php echo $columnfamily_name; ?>"><?php echo $columnfamily_name; ?></a> 
-		<?php if (!isReadyOnlyKeyspace($keyspace_name)): ?>- <a href="columnfamily_action.php?action=edit&amp;keyspace_name=<?php echo $keyspace_name; ?>&amp;columnfamily_name=<?php echo $columnfamily_name; ?>">Edit</a><?php endif; ?>
+		<?php if (!$is_read_only_keyspace): ?>- <a href="columnfamily_action.php?action=edit&amp;keyspace_name=<?php echo $keyspace_name; ?>&amp;columnfamily_name=<?php echo $columnfamily_name; ?>">Edit</a><?php endif; ?>
 	</h4>
 <?php endif; ?>
 

diff --git a/views/describe_columnfamily.php b/views/describe_columnfamily.php
@@ -5,7 +5,7 @@
 		<div class="icon browse_data"></div> Browse Data
 	</div>
 
-	<?php if (!isReadyOnlyKeyspace($keyspace_name)): ?>
+	<?php if (!$is_read_only_keyspace): ?>
 		<div class="menu_item" onclick="location.href='columnfamily_action.php?action=create_secondary_index&amp;keyspace_name=<?php echo $keyspace_name; ?>&amp;columnfamily_name=<?php echo $columnfamily_name; ?>'">
 			<div class="icon create_secondary_index"></div> Create Secondary Index
 		</div>
@@ -15,19 +15,19 @@
 		<div class="icon get_key"></div> Get Key
 	</div>
 
-	<?php if (!isReadyOnlyKeyspace($keyspace_name) && $is_counter_column): ?>
+	<?php if (!$is_read_only_keyspace && $is_counter_column): ?>
 	<div class="menu_item" onclick="location.href='counters.php?keyspace_name=<?php echo $keyspace_name; ?>&amp;columnfamily_name=<?php echo $columnfamily_name; ?>'">
 		<div class="icon counters"></div> Counters
 	</div>
 	<?php endif; ?>
 
-	<?php if (!isReadyOnlyKeyspace($keyspace_name) && !$is_counter_column): ?>
+	<?php if (!$is_read_only_keyspace && !$is_counter_column): ?>
 	<div class="menu_item" onclick="location.href='columnfamily_action.php?action=insert_row&amp;keyspace_name=<?php echo $keyspace_name; ?>&amp;columnfamily_name=<?php echo $columnfamily_name; ?>'">
 		<div class="icon insert_row"></div> Insert Row
 	</div>
 	<?php endif; ?>
 
-	<?php if (!isReadyOnlyKeyspace($keyspace_name)): ?>
+	<?php if (!$is_read_only_keyspace): ?>
 		<div class="menu_item" onclick="location.href='columnfamily_action.php?action=edit&amp;keyspace_name=<?php echo $keyspace_name; ?>&amp;columnfamily_name=<?php echo $columnfamily_name; ?>'">
 			<div class="icon edit_column_family"></div> Edit Column Family
 		</div>	

diff --git a/views/describe_keyspace.php b/views/describe_keyspace.php
@@ -1,6 +1,6 @@
 <h3><a href="index.php"><?php echo $cluster_name; ?></a> &gt; <?php echo $keyspace_name; ?></h3>
 
-<?php if (!isReadyOnlyKeyspace($keyspace_name)): ?>
+<?php if (!$is_read_only_keyspace): ?>
 <div id="menu">
 	<div class="menu_item" style="width: 220px;" onclick="location.href='keyspace_action.php?action=create_cf&amp;keyspace_name=<?php echo $keyspace_name; ?>'">
 		<div class="icon create_column_family"></div> Create New Column Family