added ability to edit artists and albums and flag all songs under them for re-taging

4 files changed, 53 insertions, 4 deletions

diff --git a/templates/show_artist.inc b/templates/show_artist.inc
index f4e426a5..2612df33 100644
--- a/templates/show_artist.inc
+++ b/templates/show_artist.inc
@@ -71,7 +71,7 @@ foreach ($albums as $album) {
 			</a>
 		<?php } ?> 
 		<?php if ($GLOBALS['user']->has_access('100')) { ?>
-			<a href="<?php echo $web_path; ?>/admin/flag.php?action=album&amp;album_id=<?php echo $album->id; ?>">
+			<a href="<?php echo $web_path; ?>/admin/flag.php?action=show_edit_album&amp;album_id=<?php echo $album->id; ?>">
 				<?php echo get_user_icon('edit'); ?>
 			</a>
 		<?php } ?>
diff --git a/templates/show_artists.inc b/templates/show_artists.inc
index 32a2bf59..a3632350 100644
--- a/templates/show_artists.inc
+++ b/templates/show_artists.inc
@@ -52,8 +52,11 @@ foreach ($artists as $artist) { ?>
 		<td><?php echo $artist['songs']; ?></td>
 		<td><?php echo $artist['albums']; ?></td>	
 		<td nowrap="nowrap"> <?php echo _("Play"); ?> : 
-			<a href="<?php echo $web_path; ?>/song.php?action=artist&amp;artist_id=<?php echo $artist['id']; ?>"><?php echo _("All"); ?></a> | 
-			<a href="<?php echo $web_path; ?>/song.php?action=artist_random&amp;artist_id=<?php echo $artist['id']; ?>"><?php echo _("Random"); ?></a> 
+			<a href="<?php echo $web_path; ?>/song.php?action=artist&amp;artist_id=<?php echo $artist['id']; ?>"><?php echo _('All'); ?></a> | 
+			<a href="<?php echo $web_path; ?>/song.php?action=artist_random&amp;artist_id=<?php echo $artist['id']; ?>"><?php echo _('Random'); ?></a> 
+		<?php if ($GLOBALS['user']->has_access(100)) { ?>
+			| <a href="<?php echo $web_path; ?>/admin/flag.php?action=show_edit_artist&amp;artist_id=<?php echo $artist['id']; ?>"><?php echo _('Edit'); ?></a>
+		<?php } ?>
 		</td>
 	</tr>
 <?php } //end foreach ($artists as $artist) ?>
diff --git a/templates/show_edit_album.inc.php b/templates/show_edit_album.inc.php
index 141288b8..3fa7fd20 100644
--- a/templates/show_edit_album.inc.php
+++ b/templates/show_edit_album.inc.php
@@ -26,7 +26,7 @@
 <tr class="<?php echo flip_class(); ?>">
 	<td><?php echo _('Name'); ?></td>
 	<td>
-		<input type="textbox" name="name" value="<?php echo scrub_out($album->artist); ?>">
+		<input type="textbox" name="name" value="<?php echo scrub_out($album->name); ?>">
 	</td>
 </tr>
 <tr class="<?php echo flip_class(); ?>">
diff --git a/templates/show_edit_artist.inc.php b/templates/show_edit_artist.inc.php
new file mode 100644
index 00000000..f3f5119a
--- /dev/null
+++ b/templates/show_edit_artist.inc.php
@@ -0,0 +1,46 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2006 Ampache.org
+ All rights reserved.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+?>
+
+<?php show_box_top(_('Edit Artist')); ?>
+<form name="edit_artist" method="post" enctype="multipart/form-data" action="<?php echo conf('web_path'); ?>/admin/flag.php?action=edit_artist">
+<table class="tabledata">
+<tr class="<?php echo flip_class(); ?>">
+	<td><?php echo _('Name'); ?></td>
+	<td>
+		<input type="textbox" name="name" value="<?php echo scrub_out($artist->name); ?>">
+	</td>
+</tr>
+<tr class="<?php echo flip_class(); ?>">
+	<td>&nbsp;</td>
+	<td>
+		<input type="checkbox" name="flag" value="1" checked="checked" /> <?php echo _('Flag for Retagging'); ?>
+	</td>
+</tr>
+<tr class="<?php echo flip_class(); ?>">
+	<td colspan="2">
+		<input type="hidden" name="artist_id" value="<?php echo $artist->id; ?>" />
+		<input type="submit" value="<?php echo _('Update Album'); ?>" />
+	</td>
+</tr>
+</table>
+</form>
+<?php show_box_bottom(); ?>