fix users, add dev tools

diff --git a/teleforma/templates/telemeta/users.html b/teleforma/templates/telemeta/users.html
index 9a42ca5e593e40a6eb19e214a2a46d0d9faa9458..965bb2f6df5ef758ba30e11c27acf5d8b13218cd 100644 (file)
--- a/teleforma/templates/telemeta/users.html
+++ b/teleforma/templates/telemeta/users.html
@@ -24,7 +24,7 @@
 </div>
 </div>
 
-{% if users %}
+{% if all_users %}
 <div class="module_action">
 <a href="{% url postman_write all_users|to_recipients %}" class="component_icon button" id="action_red">{% trans "New message" %}</a>
 </div>

diff --git a/teleforma/views.py b/teleforma/views.py
index 8218afb9201db8d2e85e2eb0edb33d1c86a8d4b2..8a26cca7bf57e91b23af7ef1bc7fd677ee333659 100755 (executable)
--- a/teleforma/views.py
+++ b/teleforma/views.py
@@ -162,7 +162,6 @@ class UsersTrainingView(UsersView):
         self.trainings = Training.objects.filter(id=self.args[0])
         return User.objects.filter(student__training__in=self.trainings)
 
-    @login_required
     def get_context_data(self, **kwargs):
         context = super(UsersTrainingView, self).get_context_data(**kwargs)
         context['training'] = Training.objects.get(id=self.args[0])

diff --git a/tools/dev/fix_svn_authors.sh b/tools/dev/fix_svn_authors.sh
new file mode 100755 (executable)
index 0000000..2f47a97
--- /dev/null
+++ b/tools/dev/fix_svn_authors.sh
@@ -0,0 +1,12 @@
+
+git filter-branch -f --commit-filter '
+        if [ "$GIT_COMMITTER_EMAIL" = "<>" ];
+        then
+                GIT_COMMITTER_NAME="<yomguy>";
+                GIT_AUTHOR_NAME="<yomguy>";
+                GIT_COMMITTER_EMAIL="<yomguy@parisson.com>";
+                GIT_AUTHOR_EMAIL="<yomguy@parisson.com>";
+                git commit-tree "$@";
+        else
+                git commit-tree "$@";
+        fi' HEAD

diff --git a/tools/dev/make_doc.sh b/tools/dev/make_doc.sh
new file mode 100755 (executable)
index 0000000..4f843ad
--- /dev/null
+++ b/tools/dev/make_doc.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# needs epydoc
+
+app="telemeta"
+dir=/home/$USER/dev/$app/doc/
+server="doc.parisson.com"
+
+epydoc -n $app -u https://github.com/yomguy/DeeFuzzer -o $dir $app/
+rsync -a $dir $server:/var/www/files/doc/$app/
+

diff --git a/tools/dev/merge_master_all.sh b/tools/dev/merge_master_all.sh
new file mode 100755 (executable)
index 0000000..b1d5216
--- /dev/null
+++ b/tools/dev/merge_master_all.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+git branch | tr -d \* | while read line
+do
+    branch=${line/#\ }
+
+    if [[ ! $branch == *master* ]]; then
+     echo "Merge master to $branch:"
+     git checkout $branch
+     git merge master
+     git checkout master
+    fi
+done
+
+echo "Done !"

diff --git a/tools/dev/merge_master_to.sh b/tools/dev/merge_master_to.sh
new file mode 100755 (executable)
index 0000000..e6e1cf7
--- /dev/null
+++ b/tools/dev/merge_master_to.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+git checkout $1
+git merge master
+git checkout master
+

diff --git a/tools/dev/push.sh b/tools/dev/push.sh
new file mode 100755 (executable)
index 0000000..1eaecc1
--- /dev/null
+++ b/tools/dev/push.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+git branch | tr -d \* | while read line
+do
+    branch=${line/#\ }
+
+    echo "Push $branch to origin:"
+    git push origin $branch
+
+    if [[ $branch == *master* ]]; then
+        echo "Push $branch to github:"
+        git push github $branch
+    fi
+
+done
+
+git push --tags
+git push --tags github
+
+ssh vcs.parisson.com "cd /var/git/telemeta.git; git update-server-info"
+
+#echo "Update jimi.parisson.com:"
+echo "Update angus.parisson.com:"
+ssh angus.parisson.com "cd /home/telemeta/telemeta-prod; git pull origin production; \
+                        cd /home/telemeta/telemeta; git pull origin master; \
+                        cd /home/telemeta/demo/; ./manage.py migrate telemeta --delete-ghost-migrations;
+                        cd /home/telemeta/sandbox/; ./manage.py migrate telemeta --delete-ghost-migrations; 
+                        cd /home/telemeta/parisson/; ./manage.py migrate telemeta --delete-ghost-migrations; "
+
+echo "Done !"

diff --git a/tools/dev/pypi.sh b/tools/dev/pypi.sh
new file mode 100755 (executable)
index 0000000..12be642
--- /dev/null
+++ b/tools/dev/pypi.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+python setup.py register
+python setup.py sdist upload
+

diff --git a/tools/dev/translate.sh b/tools/dev/translate.sh
new file mode 100755 (executable)
index 0000000..73f6d02
--- /dev/null
+++ b/tools/dev/translate.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+cd teleforma
+django-admin makemessages -a
+django-admin makemessages -d djangojs -a
+django-admin compilemessages
+cd ..