allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tvansteenbu...@apache.org
Subject [07/10] git commit: [#7097] Switch user project name to summary for better tagline implementation
Date Fri, 21 Feb 2014 22:21:55 GMT
[#7097] Switch user project name to summary for better tagline implementation

Signed-off-by: Cory Johns <cjohns@slashdotmedia.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/04a6a136
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/04a6a136
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/04a6a136

Branch: refs/heads/master
Commit: 04a6a1363daea7d3f01c179ab8dd6543bd151231
Parents: 93658dd
Author: Cory Johns <cjohns@slashdotmedia.com>
Authored: Thu Feb 13 21:31:47 2014 +0000
Committer: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Committed: Fri Feb 21 21:14:08 2014 +0000

----------------------------------------------------------------------
 Allura/allura/ext/admin/admin_main.py                            | 2 +-
 .../allura/ext/admin/templates/admin_widgets/metadata_admin.html | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/04a6a136/Allura/allura/ext/admin/admin_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/admin_main.py b/Allura/allura/ext/admin/admin_main.py
index 0c79fea..e19572b 100644
--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -386,7 +386,7 @@ class ProjectAdminController(BaseController):
             plugin.ProjectRegistrationProvider.get().undelete_project(
                 c.project, c.user)
             redirect('overview')
-        if name != c.project.name:
+        if name and name != c.project.name:
             h.log_action(log, 'change project name').info('')
             M.AuditLog.log('change project name to %s', name)
             c.project.name = name

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/04a6a136/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html b/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
index 16b303b..f894be5 100644
--- a/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
+++ b/Allura/allura/ext/admin/templates/admin_widgets/metadata_admin.html
@@ -19,10 +19,10 @@
 {% import 'allura:templates/jinja_master/lib.html' as lib with context %}
 <form method="POST" action="update" enctype="multipart/form-data" id="metadata_form">
   <div class="grid-9">
+    {%if not c.project.is_user_project %}
     {{ widget.display_label(widget.fields.name) }}
     <br>
     {{widget.display_field(widget.fields.name) }}
-    {%if c.project.neighborhood.name != 'Users'%}
     <label for="shortname">Unixname</label>
     <br>
     <input id="shortname" type="text" disabled="disabled"
@@ -35,12 +35,14 @@
     {{ widget.display_label(widget.fields.video_url) }}
     <br>
     {{widget.display_field(widget.fields.video_url) }}
+    {% endif %}
 
     {{ widget.display_label(widget.fields.summary) }}
     <br>
     {{widget.display_field(widget.fields.summary) }}
     <br>
 
+    {%if not c.project.is_user_project %}
     {{ widget.display_label(widget.fields.short_description) }}
     <br>
     {{widget.display_field(widget.fields.short_description) }}


Mime
View raw message