Merging 2.3.1 in

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.3.1
+
+### Bug Fixes
+
+* When toggling open positions, any open positions in sub-departments would throw off the display of the entire manifest.
+
 ## 2.3.0 (14 September 2013)
 
 * When displaying the output of a dynamic form, if there's nothing in the field, we no longer show it.

README.md

@@ -4,7 +4,7 @@ Anodyne Production's next-generation RPG management system combines popular feat
 
 ## Current Version
 
-2.3.0
+2.3.1
 
 ## Bug Tracker
 

nova/modules/assets/install/data.php

@@ -2244,7 +2244,7 @@
 		'sys_install_date' => now(),
 		'sys_version_major' => 2,
 		'sys_version_minor' => 3,
-		'sys_version_update' => 0)
+		'sys_version_update' => 1)
 );
 
 $tour_fields = array(

nova/modules/assets/update/update_230.php

@@ -0,0 +1,153 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/**
+ * Update Nova from 2.3 to 2.3.1
+ */
+$system_info	= null;
+$add_tables		= null;
+$drop_tables	= null;
+$rename_tables	= null;
+$add_column		= null;
+$modify_column	= null;
+$drop_column	= null;
+
+/**
+ * Version info for the database
+ */
+$system_info = array(
+	'sys_last_update'		=> now(),
+	'sys_version_major'		=> 2,
+	'sys_version_minor'		=> 3,
+	'sys_version_update'	=> 1,
+);
+
+/*
+|---------------------------------------------------------------
+| TABLES TO ADD
+|
+| $add_tables = array(
+|	'table_name' => array(
+|		'id' => 'table_id',
+|		'fields' => 'fields_table_name')
+| );
+|
+| $fields_table_name = array(
+|	'table_id' => array(
+|		'type' => 'INT',
+|		'constraint' => 6,
+|		'auto_increment' => TRUE),
+|	'table_field_1' => array(
+|		'type' => 'VARCHAR',
+|		'constraint' => 255,
+|		'default' => ''),
+|	'table_field_2' => array(
+|		'type' => 'INT',
+|		'constraint' => 4,
+|		'default' => '99')
+| );
+|---------------------------------------------------------------
+*/
+
+if ($add_tables !== null)
+{
+	foreach ($add_tables as $key => $value)
+	{
+		$this->dbforge->add_field($$value['fields']);
+		$this->dbforge->add_key($value['id'], true);
+		$this->dbforge->create_table($key, true);
+	}
+}
+
+/*
+|---------------------------------------------------------------
+| TABLES TO DROP
+|
+| $drop_tables = array('table_name');
+|---------------------------------------------------------------
+*/
+
+if ($drop_tables !== null)
+{
+	foreach ($drop_tables as $value)
+	{
+		$this->dbforge->drop_table($value);
+	}
+}
+
+/*
+|---------------------------------------------------------------
+| TABLES TO RENAME
+|
+| $rename_tables = array('old_table_name' => 'new_table_name');
+|---------------------------------------------------------------
+*/
+
+if ($rename_tables !== null)
+{
+	foreach ($rename_tables as $key => $value)
+	{
+		$this->dbforge->rename_table($key, $value);
+	}
+}
+
+/*
+|---------------------------------------------------------------
+| COLUMNS TO ADD
+|
+| $add_column = array(
+|	'table_name' => array(
+|		'field_name_1' => array('type' => 'TEXT'),
+|		'field_name_2' => array(
+|			'type' => 'VARCHAR',
+|			'constraint' => 100)
+|	)
+| );
+|---------------------------------------------------------------
+*/
+
+if ($add_column !== null)
+{
+	foreach ($add_column as $key => $value)
+	{
+		$this->dbforge->add_column($key, $value);
+	}
+}
+
+/*
+|---------------------------------------------------------------
+| COLUMNS TO MODIFY
+|
+| $modify_column = array(
+|	'table_name' => array(
+|		'old_field_name' => array(
+|			'name' => 'new_field_name',
+|			'type' => 'TEXT')
+|	)
+| );
+|---------------------------------------------------------------
+*/
+
+if ($modify_column !== null)
+{
+	foreach ($modify_column as $key => $value)
+	{
+		$this->dbforge->modify_column($key, $value);
+	}
+}
+
+/*
+|---------------------------------------------------------------
+| COLUMNS TO DROP
+|
+| $drop_column = array(
+|	'table_name' => array('field_name')
+| );
+|---------------------------------------------------------------
+*/
+
+if ($drop_column !== null)
+{
+	foreach ($drop_column as $key => $value)
+	{
+		$this->dbforge->drop_column($key, $value[0]);
+	}
+}

nova/modules/assets/update/versions.php

@@ -15,5 +15,5 @@
 	'200', '201', '202', '203',
 	'210', '211', '212', '213',
 	'220', '221', '222', '223',
-	'230',
+	'230', '231',
 );

nova/modules/assets/version.yml

@@ -1,9 +1,9 @@
-version: 2.3.0
+version: 2.3.1
 version_major: 2
 version_minor: 3
-version_update: 0
-severity: major
+version_update: 1
+severity: minor
 notes: |
-  Nova 2.3 addresses several pieces of new functionality related to dynamic forms, manifests and the sim stats. In addition, several bugs have been addressed as well.
+  Nova 2.3.1 minor issues with the manifest and incrementing/decrementing open position slots when updating characters.
 date: 14 September 2013
 link: http://www.anodyne-productions.com/nova/index.php

nova/modules/core/config/info.php

@@ -2,10 +2,10 @@
 
 define('APP_NAME',				'Nova');
 
-define('APP_VERSION',			'2.3.0');
+define('APP_VERSION',			'2.3.1');
 define('APP_VERSION_MAJOR',		2);
 define('APP_VERSION_MINOR',		3);
-define('APP_VERSION_UPDATE',	0);
+define('APP_VERSION_UPDATE',	1);
 
 define('WIKI_NAME',				'Thresher');
 define('WIKI_VERSION',			'Release 2');

nova/modules/core/views/_base/main/pages/personnel_index.php

@@ -165,13 +165,13 @@
 
 							<?php if ($spos['open'] > 0 && $sub['type'] == 'playing'): ?>
 								<tr class="open fontSmall hidden">
-									<td class="col_15"></td>
 									<td class="col_15"></td>
 									<td class="col_150"><?php echo img($spos['blank_img']);?></td>
 									<td>
 										<strong class="fontMedium"><?php echo $spos['name'];?></strong><br />
 										<?php echo anchor('main/join/'. $spos['pos_id'], $label['apply']);?>
 									</td>
+									<td></td>
 									<td class="col_75"></td>
 								</tr>
 							<?php endif; ?>